mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-26 07:58:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

big intl update, only polishing left, Issue #42

Browse source
This commit is contained in:
Peter Cottle 2013-02-23 23:31:30 -08:00
parent 7e165c6fdc
commit a0c8c34522
10 changed files with 471 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

190
build/bundle.js
View file

@ -4901,7 +4901,7 @@ var Sandbox = Backbone.View.extend({
helpDialog: function(command, deferred) { helpDialog: function(command, deferred) {
var helpDialog = new MultiView({ var helpDialog = new MultiView({
childViews: require('../dialogs/sandbox').dialog childViews: intl.getDialog(require('../dialogs/sandbox'))
}); });
helpDialog.getPromise().then(_.bind(function() { helpDialog.getPromise().then(_.bind(function() {
// the view has been closed, lets go ahead and resolve our command // the view has been closed, lets go ahead and resolve our command
@ -6561,6 +6561,11 @@ var getIntlKey = exports.getIntlKey = function(obj, key) {
return obj[key][getLocale()]; return obj[key][getLocale()];
}; };
var getDialog = exports.getDialog = function(obj) {
var defaultLocale = getDefaultLocale();
return getIntlKey(obj, 'dialog') || obj.dialog[defaultLocale];
};
var getHint = exports.getHint = function(level) { var getHint = exports.getHint = function(level) {
return getIntlKey(level, 'hint') || str('error-untranslated'); return getIntlKey(level, 'hint') || str('error-untranslated');
}; };
@ -13858,8 +13863,10 @@ var LevelBuilder = Level.extend({
options = options || {}; options = options || {};
options.level = options.level || {}; options.level = options.level || {};
options.level.startDialog = { var locale = intl.getLocale();
childViews: require('../dialogs/levelBuilder').dialog options.level.startDialog = {};
options.level.startDialog[locale] = {
childViews: intl.getDialog(require('../dialogs/levelBuilder'))
}; };
LevelBuilder.__super__.initialize.apply(this, [options]); LevelBuilder.__super__.initialize.apply(this, [options]);
@ -15130,7 +15137,8 @@ exports.MarkdownPresenter = MarkdownPresenter;
}); });
require.define("/src/js/dialogs/levelBuilder.js",function(require,module,exports,__dirname,__filename,process,global){exports.dialog = [{ require.define("/src/js/dialogs/levelBuilder.js",function(require,module,exports,__dirname,__filename,process,global){exports.dialog = {
'en_US': [{
type: 'ModalAlert', type: 'ModalAlert',
options: { options: {
markdowns: [ markdowns: [
@ -15148,7 +15156,8 @@ require.define("/src/js/dialogs/levelBuilder.js",function(require,module,exports
' * Enter the command ```finish``` to output your level JSON!' ' * Enter the command ```finish``` to output your level JSON!'
] ]
} }
}]; }]
};
}); });
@ -17430,10 +17439,12 @@ exports.sequenceInfo = {
intro: { intro: {
displayName: { displayName: {
'en_US': 'Introduction Sequence', 'en_US': 'Introduction Sequence',
'zh_CN': '简介序列',
'ko': '기본 명령어' 'ko': '기본 명령어'
}, },
about: { about: {
'en_US': 'A nicely paced introduction to the majority of git commands', 'en_US': 'A nicely paced introduction to the majority of git commands',
'zh_CN': '一个节奏感良好的主流 Git 命令介绍',
'ko': '브랜치 관련 주요 git 명령어를 깔끔하게 알려드립니다' 'ko': '브랜치 관련 주요 git 명령어를 깔끔하게 알려드립니다'
} }
}, },
@ -19859,7 +19870,8 @@ exports.detectZoom = detectZoom;
}); });
require.define("/src/js/dialogs/sandbox.js",function(require,module,exports,__dirname,__filename,process,global){exports.dialog = [{ require.define("/src/js/dialogs/sandbox.js",function(require,module,exports,__dirname,__filename,process,global){exports.dialog = {
'en_US': [{
type: 'ModalAlert', type: 'ModalAlert',
options: { options: {
markdowns: [ markdowns: [
@ -19912,8 +19924,75 @@ require.define("/src/js/dialogs/sandbox.js",function(require,module,exports,__di
'For now let\'s get you started on the `levels`...' 'For now let\'s get you started on the `levels`...'
] ]
} }
}]; }],
'ko': [{
type: 'ModalAlert',
options: {
markdowns: [
//'## Welcome to LearnGitBranching!',
'## Git 브랜치 배우기를 시작합니다!',
'',
// 'This application is designed to help beginners grasp ',
// 'the powerful concepts behind branching when working ',
// 'with git. We hope you enjoy this application and maybe ',
// 'even learn something!',
'이 애플리케이션은 git을 쓸 때 필요한 브랜치에 대한 개념을',
'탄탄히 잡게끔 도와드리기 위해 만들었습니다. 재밌게 사용해주시기를',
'바라며, 무언가를 배워가신다면 더 기쁘겠습니다!',
// '',
// '# Attention HN!!',
// '',
// 'Unfortunately this was submitted before I finished all the help ',
// 'and tutorial sections, so forgive the scarcity. See the demo here:',
'',
'이 애플리케이션은 [Peter Cottle](https://github.com/pcottle)님의 [LearnGitBranching](http://pcottle.github.com/learnGitBranching/)를 번역한 것입니다.',
'아래 데모를 먼저 보셔도 좋습니다.',
'',
'<http://pcottle.github.com/learnGitBranching/?demo&locale=ko>'
]
}
}, {
type: 'ModalAlert',
options: {
markdowns: [
// '## Git commands',
'## Git 명령어',
'',
// 'You have a large variety of git commands available in sandbox mode. These include',
'연습 모드에서 쓸 수 있는 다양한 git명령어는 다음과 같습니다',
'',
' * commit',
' * branch',
' * checkout',
' * cherry-pick',
' * reset',
' * revert',
' * rebase',
' * merge'
]
}
}, {
type: 'ModalAlert',
options: {
markdowns: [
// '## Sharing is caring!',
// '',
// 'Share trees with your friends via `export tree` and `import tree`',
// '',
// 'Have a great lesson to share? Try building a level with `build level` or try out a friend\'s level with `import level`',
// '',
// 'For now let\'s get you started on the `levels`...'
'## 공유해주세요!',
'',
'`export tree` 와 `import tree`로 여러분의 친구들에게 트리를 공유해주세요',
'',
'훌륭한 학습 자료가 있으신가요? `build level`로 레벨을 만들어 보시거나, 친구의 레벨을 `import level`로 가져와서 실험해보세요',
'',
'이제 레슨을 시작해봅시다...'
]
}
}]
};
}); });
@ -20237,7 +20316,8 @@ exports.init = init;
}); });
require("/src/js/app/index.js"); require("/src/js/app/index.js");
require.define("/src/js/dialogs/levelBuilder.js",function(require,module,exports,__dirname,__filename,process,global){exports.dialog = [{ require.define("/src/js/dialogs/levelBuilder.js",function(require,module,exports,__dirname,__filename,process,global){exports.dialog = {
'en_US': [{
type: 'ModalAlert', type: 'ModalAlert',
options: { options: {
markdowns: [ markdowns: [
@ -20255,12 +20335,14 @@ require.define("/src/js/dialogs/levelBuilder.js",function(require,module,exports
' * Enter the command ```finish``` to output your level JSON!' ' * Enter the command ```finish``` to output your level JSON!'
] ]
} }
}]; }]
};
}); });
require("/src/js/dialogs/levelBuilder.js"); require("/src/js/dialogs/levelBuilder.js");
require.define("/src/js/dialogs/sandbox.js",function(require,module,exports,__dirname,__filename,process,global){exports.dialog = [{ require.define("/src/js/dialogs/sandbox.js",function(require,module,exports,__dirname,__filename,process,global){exports.dialog = {
'en_US': [{
type: 'ModalAlert', type: 'ModalAlert',
options: { options: {
markdowns: [ markdowns: [
@ -20313,8 +20395,75 @@ require.define("/src/js/dialogs/sandbox.js",function(require,module,exports,__di
'For now let\'s get you started on the `levels`...' 'For now let\'s get you started on the `levels`...'
] ]
} }
}]; }],
'ko': [{
type: 'ModalAlert',
options: {
markdowns: [
//'## Welcome to LearnGitBranching!',
'## Git 브랜치 배우기를 시작합니다!',
'',
// 'This application is designed to help beginners grasp ',
// 'the powerful concepts behind branching when working ',
// 'with git. We hope you enjoy this application and maybe ',
// 'even learn something!',
'이 애플리케이션은 git을 쓸 때 필요한 브랜치에 대한 개념을',
'탄탄히 잡게끔 도와드리기 위해 만들었습니다. 재밌게 사용해주시기를',
'바라며, 무언가를 배워가신다면 더 기쁘겠습니다!',
// '',
// '# Attention HN!!',
// '',
// 'Unfortunately this was submitted before I finished all the help ',
// 'and tutorial sections, so forgive the scarcity. See the demo here:',
'',
'이 애플리케이션은 [Peter Cottle](https://github.com/pcottle)님의 [LearnGitBranching](http://pcottle.github.com/learnGitBranching/)를 번역한 것입니다.',
'아래 데모를 먼저 보셔도 좋습니다.',
'',
'<http://pcottle.github.com/learnGitBranching/?demo&locale=ko>'
]
}
}, {
type: 'ModalAlert',
options: {
markdowns: [
// '## Git commands',
'## Git 명령어',
'',
// 'You have a large variety of git commands available in sandbox mode. These include',
'연습 모드에서 쓸 수 있는 다양한 git명령어는 다음과 같습니다',
'',
' * commit',
' * branch',
' * checkout',
' * cherry-pick',
' * reset',
' * revert',
' * rebase',
' * merge'
]
}
}, {
type: 'ModalAlert',
options: {
markdowns: [
// '## Sharing is caring!',
// '',
// 'Share trees with your friends via `export tree` and `import tree`',
// '',
// 'Have a great lesson to share? Try building a level with `build level` or try out a friend\'s level with `import level`',
// '',
// 'For now let\'s get you started on the `levels`...'
'## 공유해주세요!',
'',
'`export tree` 와 `import tree`로 여러분의 친구들에게 트리를 공유해주세요',
'',
'훌륭한 학습 자료가 있으신가요? `build level`로 레벨을 만들어 보시거나, 친구의 레벨을 `import level`로 가져와서 실험해보세요',
'',
'이제 레슨을 시작해봅시다...'
]
}
}]
};
}); });
require("/src/js/dialogs/sandbox.js"); require("/src/js/dialogs/sandbox.js");
@ -22678,6 +22827,11 @@ var getIntlKey = exports.getIntlKey = function(obj, key) {
return obj[key][getLocale()]; return obj[key][getLocale()];
}; };
var getDialog = exports.getDialog = function(obj) {
var defaultLocale = getDefaultLocale();
return getIntlKey(obj, 'dialog') || obj.dialog[defaultLocale];
};
var getHint = exports.getHint = function(level) { var getHint = exports.getHint = function(level) {
return getIntlKey(level, 'hint') || str('error-untranslated'); return getIntlKey(level, 'hint') || str('error-untranslated');
}; };
@ -23116,8 +23270,10 @@ var LevelBuilder = Level.extend({
options = options || {}; options = options || {};
options.level = options.level || {}; options.level = options.level || {};
options.level.startDialog = { var locale = intl.getLocale();
childViews: require('../dialogs/levelBuilder').dialog options.level.startDialog = {};
options.level.startDialog[locale] = {
childViews: intl.getDialog(require('../dialogs/levelBuilder'))
}; };
LevelBuilder.__super__.initialize.apply(this, [options]); LevelBuilder.__super__.initialize.apply(this, [options]);
@ -24484,7 +24640,7 @@ var Sandbox = Backbone.View.extend({
helpDialog: function(command, deferred) { helpDialog: function(command, deferred) {
var helpDialog = new MultiView({ var helpDialog = new MultiView({
childViews: require('../dialogs/sandbox').dialog childViews: intl.getDialog(require('../dialogs/sandbox'))
}); });
helpDialog.getPromise().then(_.bind(function() { helpDialog.getPromise().then(_.bind(function() {
// the view has been closed, lets go ahead and resolve our command // the view has been closed, lets go ahead and resolve our command
@ -30351,10 +30507,12 @@ exports.sequenceInfo = {
intro: { intro: {
displayName: { displayName: {
'en_US': 'Introduction Sequence', 'en_US': 'Introduction Sequence',
'zh_CN': '简介序列',
'ko': '기본 명령어' 'ko': '기본 명령어'
}, },
about: { about: {
'en_US': 'A nicely paced introduction to the majority of git commands', 'en_US': 'A nicely paced introduction to the majority of git commands',
'zh_CN': '一个节奏感良好的主流 Git 命令介绍',
'ko': '브랜치 관련 주요 git 명령어를 깔끔하게 알려드립니다' 'ko': '브랜치 관련 주요 git 명령어를 깔끔하게 알려드립니다'
} }
}, },

1
build/bundle.min.2076073f.js Normal file
View file

File diff suppressed because one or more lines are too long

1
build/bundle.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

2
index.html
View file

@ -410,7 +410,7 @@
For a much easier time perusing the source, see the individual files at: For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching https://github.com/pcottle/learnGitBranching
--> -->
<script src="build/bundle.js"></script> <script src="build/bundle.min.2076073f.js"></script>
<!-- The advantage of github pages: super-easy, simple, slick static hostic. <!-- The advantage of github pages: super-easy, simple, slick static hostic.
The downside? No raw logs to parse for analytics, so I have to include The downside? No raw logs to parse for analytics, so I have to include

6
src/js/dialogs/levelBuilder.js
View file

@ -1,4 +1,5 @@
exports.dialog = [{ exports.dialog = {
'en_US': [{
type: 'ModalAlert', type: 'ModalAlert',
options: { options: {
markdowns: [ markdowns: [
@ -16,4 +17,5 @@ exports.dialog = [{
' * Enter the command ```finish``` to output your level JSON!' ' * Enter the command ```finish``` to output your level JSON!'
] ]
} }
}]; }]
};

74
src/js/dialogs/sandbox.js
View file

@ -1,4 +1,5 @@
exports.dialog = [{ exports.dialog = {
'en_US': [{
type: 'ModalAlert', type: 'ModalAlert',
options: { options: {
markdowns: [ markdowns: [
@ -51,5 +52,72 @@ exports.dialog = [{
'For now let\'s get you started on the `levels`...' 'For now let\'s get you started on the `levels`...'
] ]
} }
}]; }],
'ko': [{
type: 'ModalAlert',
options: {
markdowns: [
//'## Welcome to LearnGitBranching!',
'## Git 브랜치 배우기를 시작합니다!',
'',
// 'This application is designed to help beginners grasp ',
// 'the powerful concepts behind branching when working ',
// 'with git. We hope you enjoy this application and maybe ',
// 'even learn something!',
'이 애플리케이션은 git을 쓸 때 필요한 브랜치에 대한 개념을',
'탄탄히 잡게끔 도와드리기 위해 만들었습니다. 재밌게 사용해주시기를',
'바라며, 무언가를 배워가신다면 더 기쁘겠습니다!',
// '',
// '# Attention HN!!',
// '',
// 'Unfortunately this was submitted before I finished all the help ',
// 'and tutorial sections, so forgive the scarcity. See the demo here:',
'',
'이 애플리케이션은 [Peter Cottle](https://github.com/pcottle)님의 [LearnGitBranching](http://pcottle.github.com/learnGitBranching/)를 번역한 것입니다.',
'아래 데모를 먼저 보셔도 좋습니다.',
'',
'<http://pcottle.github.com/learnGitBranching/?demo&locale=ko>'
]
}
}, {
type: 'ModalAlert',
options: {
markdowns: [
// '## Git commands',
'## Git 명령어',
'',
// 'You have a large variety of git commands available in sandbox mode. These include',
'연습 모드에서 쓸 수 있는 다양한 git명령어는 다음과 같습니다',
'',
' * commit',
' * branch',
' * checkout',
' * cherry-pick',
' * reset',
' * revert',
' * rebase',
' * merge'
]
}
}, {
type: 'ModalAlert',
options: {
markdowns: [
// '## Sharing is caring!',
// '',
// 'Share trees with your friends via `export tree` and `import tree`',
// '',
// 'Have a great lesson to share? Try building a level with `build level` or try out a friend\'s level with `import level`',
// '',
// 'For now let\'s get you started on the `levels`...'
'## 공유해주세요!',
'',
'`export tree` 와 `import tree`로 여러분의 친구들에게 트리를 공유해주세요',
'',
'훌륭한 학습 자료가 있으신가요? `build level`로 레벨을 만들어 보시거나, 친구의 레벨을 `import level`로 가져와서 실험해보세요',
'',
'이제 레슨을 시작해봅시다...'
]
}
}]
};

5
src/js/intl/index.js
View file

@ -72,6 +72,11 @@ var getIntlKey = exports.getIntlKey = function(obj, key) {
return obj[key][getLocale()]; return obj[key][getLocale()];
}; };
var getDialog = exports.getDialog = function(obj) {
var defaultLocale = getDefaultLocale();
return getIntlKey(obj, 'dialog') || obj.dialog[defaultLocale];
};
var getHint = exports.getHint = function(level) { var getHint = exports.getHint = function(level) {
return getIntlKey(level, 'hint') || str('error-untranslated'); return getIntlKey(level, 'hint') || str('error-untranslated');
}; };

6
src/js/level/builder.js
View file

@ -44,8 +44,10 @@ var LevelBuilder = Level.extend({
options = options || {}; options = options || {};
options.level = options.level || {}; options.level = options.level || {};
options.level.startDialog = { var locale = intl.getLocale();
childViews: require('../dialogs/levelBuilder').dialog options.level.startDialog = {};
options.level.startDialog[locale] = {
childViews: intl.getDialog(require('../dialogs/levelBuilder'))
}; };
LevelBuilder.__super__.initialize.apply(this, [options]); LevelBuilder.__super__.initialize.apply(this, [options]);

2
src/js/level/sandbox.js
View file

@ -397,7 +397,7 @@ var Sandbox = Backbone.View.extend({
helpDialog: function(command, deferred) { helpDialog: function(command, deferred) {
var helpDialog = new MultiView({ var helpDialog = new MultiView({
childViews: require('../dialogs/sandbox').dialog childViews: intl.getDialog(require('../dialogs/sandbox'))
}); });
helpDialog.getPromise().then(_.bind(function() { helpDialog.getPromise().then(_.bind(function() {
// the view has been closed, lets go ahead and resolve our command // the view has been closed, lets go ahead and resolve our command

2
src/levels/index.js
View file

@ -24,10 +24,12 @@ exports.sequenceInfo = {
intro: { intro: {
displayName: { displayName: {
'en_US': 'Introduction Sequence', 'en_US': 'Introduction Sequence',
'zh_CN': '简介序列',
'ko': '기본 명령어' 'ko': '기본 명령어'
}, },
about: { about: {
'en_US': 'A nicely paced introduction to the majority of git commands', 'en_US': 'A nicely paced introduction to the majority of git commands',
'zh_CN': '一个节奏感良好的主流 Git 命令介绍',
'ko': '브랜치 관련 주요 git 명령어를 깔끔하게 알려드립니다' 'ko': '브랜치 관련 주요 git 명령어를 깔끔하게 알려드립니다'
} }
}, },