From 39f04f0f8b81abb31fc49ebce87a46b26cd23081 Mon Sep 17 00:00:00 2001
From: Kojo Idrissa <kojo.idrissa@gmail.com>
Date: Sat, 28 Feb 2015 15:03:40 -0600
Subject: [PATCH 1/3] added new load message to level_loading.jade and the
English, Traditional Chinese and Simplified Chinese localization files
---
app/locale/en.coffee | 3 ++-
app/locale/zh-HANS.coffee | 3 ++-
app/locale/zh-HANT.coffee | 3 ++-
app/templates/play/level/level_loading.jade | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/app/locale/en.coffee b/app/locale/en.coffee
index 9534e387e..d97433d3e 100644
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@@ -295,7 +295,8 @@
tip_toggle_play: "Toggle play/paused with Ctrl+P."
tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
tip_guide_exists: "Click the guide, inside game menu (at the top of the page), for useful info."
- tip_open_source: "CodeCombat is 100% open source!"
+ tip_open_source_1: "CodeCombat is 100% open source!"
+ tip_open_source_2: "You can help CodeCombat improve! Go to https://github.com/codecombat/codecombat/wiki/Archmage-Home"
tip_beta_launch: "CodeCombat launched its beta in October, 2013."
tip_think_solution: "Think of the solution, not the problem."
tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index faca902e6..c00274698 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -295,7 +295,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
tip_toggle_play: "用 Ctrl+P 来暂停或继续"
tip_scrub_shortcut: "用 Ctrl+[ 和 Ctrl+] 来倒退和快进。"
tip_guide_exists: "点击页面上方的指南, 可以获得更多有用信息。"
- tip_open_source: "CodeCombat是100%开源的！"
+ tip_open_source_1: "「CodeCombat」是100%开源的！"
+ tip_open_source_2: "你可以帮助「CodeCombat」提高！ 读https://github.com/codecombat/codecombat/wiki/Archmage-Home"
tip_beta_launch: "CodeCombat开始于2013的10月份。"
tip_think_solution: "思考如何解决, 而不是思考问题。"
tip_theory_practice: "在理论上，理论和实践之间是没有区别的。但在实践上，它们是有区别的。 - Yogi Berra"
diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee
index 8dbc1f37b..bb876fde5 100644
--- a/app/locale/zh-HANT.coffee
+++ b/app/locale/zh-HANT.coffee
@@ -295,7 +295,8 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
tip_toggle_play: "使用 Ctrl+P 切換 播放/暫停."
tip_scrub_shortcut: "Ctrl+[ 快退; Ctrl+] 快進."
tip_guide_exists: "點擊頁面上方的指南，可獲得更多有用的訊息."
- tip_open_source: "「CodeCombat」100% 開源!"
+ tip_open_source_1: "「CodeCombat」100% 開源!"
+ tip_open_source_2: "你可以幫助「CodeCombat」提高！ 讀https://github.com/codecombat/codecombat/wiki/Archmage-Home"
tip_beta_launch: "「CodeCombat」在2013年10月進入 BETA 測試。"
tip_think_solution: "思考解決方法而不是問題."
tip_theory_practice: "理論上, 理論和實作之間是沒有區別. 但是實作上, 這兩者是有區別的. - Yogi Berra"
diff --git a/app/templates/play/level/level_loading.jade b/app/templates/play/level/level_loading.jade
index eebd055eb..98dde6680 100644
--- a/app/templates/play/level/level_loading.jade
+++ b/app/templates/play/level/level_loading.jade
@@ -28,7 +28,8 @@
strong.tip(data-i18n='play_level.tip_toggle_play') Toggle play/paused with Ctrl+P.
strong.tip(data-i18n='play_level.tip_scrub_shortcut') Ctrl+[ and Ctrl+] rewind and fast-forward.
strong.tip(data-i18n='play_level.tip_guide_exists') Click the guide, inside game menu (at the top of the page), for useful info.
- strong.tip(data-i18n='play_level.tip_open_source') CodeCombat is 100% open source!
+ strong.tip(data-i18n='play_level.tip_open_source_1') CodeCombat is 100% open source!
+ strong.tip(data-i18n='play_level.tip_open_source_2') You can help CodeCombat improve! Go to https://github.com/codecombat/codecombat/wiki/Archmage-Home
strong.tip(data-i18n='play_level.tip_beta_launch') CodeCombat launched its beta in October, 2013.
strong.tip(data-i18n='play_level.tip_think_solution') Think of the solution, not the problem.
strong.tip(data-i18n='play_level.tip_theory_practice') In theory there is no difference between theory and practice; in practice there is. - Yogi Berra
From 5812f954f78f3f58af08b09b502e8c567ac82d50 Mon Sep 17 00:00:00 2001
From: Kojo Idrissa <kojo.idrissa@gmail.com>
Date: Sat, 28 Feb 2015 15:09:12 -0600
Subject: [PATCH 2/3] added new loading message/tip from prior commit to en-GB
& en-US.coffee files
---
app/locale/en-GB.coffee | 3 ++-
app/locale/en-US.coffee | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/locale/en-GB.coffee b/app/locale/en-GB.coffee
index 236f062cc..7666d6144 100644
--- a/app/locale/en-GB.coffee
+++ b/app/locale/en-GB.coffee
@@ -295,7 +295,8 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
# tip_toggle_play: "Toggle play/paused with Ctrl+P."
# tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
# tip_guide_exists: "Click the guide, inside game menu (at the top of the page), for useful info."
-# tip_open_source: "CodeCombat is 100% open source!"
+# tip_open_source_1: "CodeCombat is 100% open source!"
+# tip_open_source_2: "You can help CodeCombat improve! Go to https://github.com/codecombat/codecombat/wiki/Archmage-Home"
# tip_beta_launch: "CodeCombat launched its beta in October, 2013."
# tip_think_solution: "Think of the solution, not the problem."
# tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee
index be5339f19..0f75f8418 100644
--- a/app/locale/en-US.coffee
+++ b/app/locale/en-US.coffee
@@ -295,7 +295,8 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
# tip_toggle_play: "Toggle play/paused with Ctrl+P."
# tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
# tip_guide_exists: "Click the guide, inside game menu (at the top of the page), for useful info."
-# tip_open_source: "CodeCombat is 100% open source!"
+# tip_open_source_1: "CodeCombat is 100% open source!"
+# tip_open_source_2: "You can help CodeCombat improve! Go to https://github.com/codecombat/codecombat/wiki/Archmage-Home"
# tip_beta_launch: "CodeCombat launched its beta in October, 2013."
# tip_think_solution: "Think of the solution, not the problem."
# tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
From bad3b48af1ed2c2398711174f713f797090e0f12 Mon Sep 17 00:00:00 2001
From: Kojo Idrissa <kojo.idrissa@gmail.com>
Date: Sat, 28 Feb 2015 15:47:43 -0600
Subject: [PATCH 3/3] reverted "open_source_1" back to "open_source"; changed
"open_source_2" to "open_source_contribute"
---
app/locale/en.coffee | 4 ++--
app/locale/zh-HANS.coffee | 4 ++--
app/locale/zh-HANT.coffee | 4 ++--
app/templates/play/level/level_loading.jade | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/app/locale/en.coffee b/app/locale/en.coffee
index d97433d3e..ff28b9268 100644
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@@ -295,8 +295,8 @@
tip_toggle_play: "Toggle play/paused with Ctrl+P."
tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
tip_guide_exists: "Click the guide, inside game menu (at the top of the page), for useful info."
- tip_open_source_1: "CodeCombat is 100% open source!"
- tip_open_source_2: "You can help CodeCombat improve! Go to https://github.com/codecombat/codecombat/wiki/Archmage-Home"
+ tip_open_source: "CodeCombat is 100% open source!"
+ tip_open_source_contribute: "You can help CodeCombat improve! Go to https://github.com/codecombat/codecombat/wiki/Archmage-Home"
tip_beta_launch: "CodeCombat launched its beta in October, 2013."
tip_think_solution: "Think of the solution, not the problem."
tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index c00274698..facfc2d58 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -295,8 +295,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
tip_toggle_play: "用 Ctrl+P 来暂停或继续"
tip_scrub_shortcut: "用 Ctrl+[ 和 Ctrl+] 来倒退和快进。"
tip_guide_exists: "点击页面上方的指南, 可以获得更多有用信息。"
- tip_open_source_1: "「CodeCombat」是100%开源的！"
- tip_open_source_2: "你可以帮助「CodeCombat」提高！ 读https://github.com/codecombat/codecombat/wiki/Archmage-Home"
+ tip_open_source: "「CodeCombat」是100%开源的！"
+ tip_open_source_contribute: "你可以帮助「CodeCombat」提高！ 读https://github.com/codecombat/codecombat/wiki/Archmage-Home"
tip_beta_launch: "CodeCombat开始于2013的10月份。"
tip_think_solution: "思考如何解决, 而不是思考问题。"
tip_theory_practice: "在理论上，理论和实践之间是没有区别的。但在实践上，它们是有区别的。 - Yogi Berra"
diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee
index bb876fde5..79e659db9 100644
--- a/app/locale/zh-HANT.coffee
+++ b/app/locale/zh-HANT.coffee
@@ -295,8 +295,8 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
tip_toggle_play: "使用 Ctrl+P 切換 播放/暫停."
tip_scrub_shortcut: "Ctrl+[ 快退; Ctrl+] 快進."
tip_guide_exists: "點擊頁面上方的指南，可獲得更多有用的訊息."
- tip_open_source_1: "「CodeCombat」100% 開源!"
- tip_open_source_2: "你可以幫助「CodeCombat」提高！ 讀https://github.com/codecombat/codecombat/wiki/Archmage-Home"
+ tip_open_source: "「CodeCombat」100% 開源!"
+ tip_open_source_contribute: "你可以幫助「CodeCombat」提高！ 讀https://github.com/codecombat/codecombat/wiki/Archmage-Home"
tip_beta_launch: "「CodeCombat」在2013年10月進入 BETA 測試。"
tip_think_solution: "思考解決方法而不是問題."
tip_theory_practice: "理論上, 理論和實作之間是沒有區別. 但是實作上, 這兩者是有區別的. - Yogi Berra"
diff --git a/app/templates/play/level/level_loading.jade b/app/templates/play/level/level_loading.jade
index 98dde6680..7566cf0dd 100644
--- a/app/templates/play/level/level_loading.jade
+++ b/app/templates/play/level/level_loading.jade
@@ -28,8 +28,8 @@
strong.tip(data-i18n='play_level.tip_toggle_play') Toggle play/paused with Ctrl+P.
strong.tip(data-i18n='play_level.tip_scrub_shortcut') Ctrl+[ and Ctrl+] rewind and fast-forward.
strong.tip(data-i18n='play_level.tip_guide_exists') Click the guide, inside game menu (at the top of the page), for useful info.
- strong.tip(data-i18n='play_level.tip_open_source_1') CodeCombat is 100% open source!
- strong.tip(data-i18n='play_level.tip_open_source_2') You can help CodeCombat improve! Go to https://github.com/codecombat/codecombat/wiki/Archmage-Home
+ strong.tip(data-i18n='play_level.tip_open_source') CodeCombat is 100% open source!
+ strong.tip(data-i18n='play_level.tip_open_source_contribute') You can help CodeCombat improve! Go to https://github.com/codecombat/codecombat/wiki/Archmage-Home
strong.tip(data-i18n='play_level.tip_beta_launch') CodeCombat launched its beta in October, 2013.
strong.tip(data-i18n='play_level.tip_think_solution') Think of the solution, not the problem.
strong.tip(data-i18n='play_level.tip_theory_practice') In theory there is no difference between theory and practice; in practice there is. - Yogi Berra