Skip to content

Commit 6607993

Browse files
iliakaniliakan
committed
misc
1 parent f794322 commit 6607993

5 files changed

Lines changed: 140 additions & 29 deletions

File tree

‎locales/en.yml‎

Lines changed: 67 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,73 @@
11
site:
2-
comments: Comments
2+
privacy_policy: Privacy policy
33

4-
tutorial: Tutorial
5-
tutorial_map: Tutorial map
6-
additional_articles: Additional articles
4+
gdpr_dialog:
5+
title: This website uses cookies
6+
text: We use browser technologies such as cookies and local storage to store your preferences. You need to accept our <a href="/privacy">Privacy Policy</a> and <a href="/terms">Terms of Use</a> for us to do so.
7+
accept: Accept
8+
cancel: Cancel
79

8-
edit_on_github: Edit on Github
10+
toolbar:
11+
lang_switcher:
12+
cta_text: We want to make this open-source project available for people all around the world. Please <a href="https://github.com/iliakan/javascript-tutorial-en" rel="noopener noreferrer" target="_blank">help us to translate</a> the content of this tutorial to the language you know
13+
footer_text: how much content is translated to the corresponding language
14+
old_version: Old version is published, needs backporting.
15+
logo:
16+
normal:
17+
svg: sitetoolbar__logo_en.svg
18+
width: 200 # 171
19+
normal-white:
20+
svg: sitetoolbar__logo_en-white.svg
21+
small:
22+
svg: sitetoolbar__logo_small_en.svg
23+
width: 70
24+
small-white:
25+
svg: sitetoolbar__logo_small_en-white.svg
26+
sections:
27+
- slug: ''
28+
url: '/'
29+
title: 'Tutorial'
30+
- slug: 'courses'
31+
title: 'Courses'
32+
buy_ebook_extra: 'Buy'
33+
buy_ebook: 'EPUB/PDF'
34+
search_placeholder: 'Search on Javascript.info'
35+
search_button: 'Search'
36+
37+
public_profile: Public profile
38+
account: Account
39+
notifications: Notifications
40+
admin: Admin
41+
logout: Logout
42+
43+
sorry_old_browser: Sorry, IE<10 is not supported, please use a newer browser.
44+
contact_us: contact us
45+
about_the_project: about the project
46+
ilya_kantor: Ilya Kantor
47+
comments: Comments
48+
loading: Loading...
49+
search: Search
50+
share: Share
51+
read_before_commenting: read this before commenting…
952

1053
meta:
1154
description: 'Modern JavaScript Tutorial: simple, but detailed explanations with examples and tasks, including: closures, document and events, object oriented programming and more.'
12-
title: The Modern JavaScript Tutorial
13-
subtitle: "How it's done now. From the basics to advanced topics with simple, but detailed explanations."
14-
toc: 'Table of contents'
15-
description: 'Main course contains 2 parts which cover JavaScript as a programming language and working with a browser. There are also additional series of thematic articles.'
55+
56+
tablet-menu:
57+
choose_section: Choose section
58+
search_placeholder: Search in the tutorial
59+
search_button: Search
60+
61+
comment:
62+
help:
63+
- You're welcome to post additions, questions to the articles and answers to them.
64+
- To insert a few words of code, use the <code>&lt;code&gt;</code> tag, for several lines – use <code>&lt;pre&gt;</code>, for more than 10 lines – use a sandbox (<a href='http://plnkr.co/edit/?p=preview'>plnkr</a>, <a href='http://jsbin.com'>JSBin</a>, <a href='http://codepen.io'>codepen</a>…)
65+
- If you can't understand something in the article – please elaborate.
66+
67+
edit_on_github: Edit on Github
68+
error: error
69+
close: close
70+
71+
hide_forever: hide permanently
72+
hidden_forever: This information will not show up any more.
73+

‎locales/ru.yml‎

Lines changed: 69 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,75 @@
11
site:
2+
privacy_policy: Privacy policy
3+
4+
toolbar:
5+
lang_switcher:
6+
cta_text: Мы хотим сделать этот проект с открытым исходным кодом доступным для людей во всем мире. Пожалуйста, <a href="https://github.com/iliakan/javascript-tutorial-en" rel="noopener noreferrer" target="_blank">помогите нам перевести</a> это руководство на свой язык
7+
footer_text: количество контента, переведенное на соотвествующий язык
8+
old_version: Опубликована полная, но предыдущая версия учебника.
9+
logo:
10+
normal:
11+
svg: sitetoolbar__logo_ru.svg
12+
width: 171
13+
normal-white:
14+
svg: sitetoolbar__logo_ru-white.svg
15+
small:
16+
svg: sitetoolbar__logo_small_ru.svg
17+
width: 80
18+
small-white:
19+
svg: sitetoolbar__logo_small_ru-white.svg
20+
sections:
21+
- slug: 'tutorial'
22+
url: '/'
23+
title: 'Учебник'
24+
- slug: 'courses'
25+
title: 'Курсы'
26+
- url: 'https://javascript.ru/forum/'
27+
title: 'Форум'
28+
- url: 'https://es5.javascript.ru'
29+
title: 'ES5'
30+
- slug: 'quiz'
31+
title: 'Тесты знаний'
32+
- slug: 'jobs'
33+
title: 'Стажировки'
34+
buy_ebook_extra: 'Купить'
35+
buy_ebook: 'EPUB/PDF'
36+
search_placeholder: 'Искать на Javascript.ru'
37+
search_button: 'Найти'
38+
39+
public_profile: Публичный профиль
40+
account: Аккаунт
41+
notifications: Уведомления
42+
admin: Админ
43+
logout: Выйти
44+
45+
sorry_old_browser: Извините, IE<10 не поддерживается, пожалуйста используйте более новый браузер.
46+
contact_us: связаться с нами
47+
about_the_project: о проекте
48+
ilya_kantor: Илья Кантор
249
comments: Комментарии
50+
loading: Загружается...
51+
search: Искать
52+
share: Поделиться
53+
read_before_commenting: перед тем как писать…
354

4-
tutorial: Учебник
5-
tutorial_map: Карта учебника
6-
additional_articles: Дополнительно
55+
tablet-menu:
56+
choose_section: Выберите раздел
57+
search_placeholder: Поиск в учебнике
58+
search_button: Поиск
759

8-
edit_on_github: Редактировать на Github
60+
comment:
61+
help:
62+
- Приветствуются комментарии, содержащие дополнения и вопросы по статье, и ответы на них.
63+
- Для одной строки кода используйте тег <code>&lt;code&gt;</code>, для нескольких строк кода&nbsp;&mdash; тег <code>&lt;pre&gt;</code>, если больше 10 строк&nbsp;&mdash; ссылку на песочницу (<a href='http://plnkr.co/edit/?p=preview'>plnkr</a>, <a href='http://jsbin.com'>JSBin</a>, <a href='http://codepen.io'>codepen</a>…)
64+
- Если что-то непонятно в статье&nbsp;&mdash; пишите, что именно и с какого места.
965

1066
meta:
11-
description: 'Modern JavaScript Tutorial: simple, but detailed explanations with examples and tasks, including: closures, document and events, object oriented programming and more.'
12-
title: The Modern JavaScript Tutorial
13-
subtitle: "How it's done now. From the basics to advanced topics with simple, but detailed explanations."
14-
toc: 'Table of contents'
15-
description: 'Main course contains 2 parts which cover JavaScript as a programming language and working with a browser. There are also additional series of thematic articles.'
67+
description: 'Современный учебник JavaScript, начиная с основ, включающий в себя много тонкостей и фишек JavaScript/DOM.'
68+
69+
edit_on_github: Редактировать на Github
70+
error: ошибка
71+
close: закрыть
72+
73+
hide_forever: не показывать
74+
hidden_forever: Эта информация больше не будет выводиться.
75+

‎modules/config/handlers.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const path = require('path');
44
const fs = require('fs');
55

66
let handlerNames = [
7-
'static',
7+
'jsengine/koa/static',
88
'jsengine/koa/requestId',
99
'jsengine/koa/requestLog',
1010
'jsengine/koa/nocache',

‎modules/config/webpack.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ module.exports = function () {
4242

4343
//console.log("MODULE DIRS", modulesDirectories);
4444

45+
4546
/**
4647
* handler/client/assets/* goes to public/assets/
4748
*/
@@ -54,6 +55,7 @@ module.exports = function () {
5455
assetPaths.push(from);
5556
}
5657
}
58+
5759
//console.log("ASSET PATHS", assetPaths);
5860

5961
/**
@@ -141,7 +143,7 @@ module.exports = function () {
141143
},
142144
{
143145
test: /\.pug$/,
144-
use: 'pug-loader?root=' + config.projectRoot + '/templates'
146+
use: 'pug-loader?root=' + config.projectRoot + '/templates&globals=__'
145147
},
146148
{
147149
test: /\.js$/,

‎modules/static/index.js‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)