From 34c883b7df85e7baf5f8f4e90a9303bcda479aa8 Mon Sep 17 00:00:00 2001 From: Glen De Cauwsemaecker Date: Sat, 12 Apr 2014 16:55:59 +0200 Subject: [PATCH] Moved language selection to the top and starting localized the hardcoded stuff. --- .../windows/coco-dev-setup/batch/config/config.coco | 2 +- .../batch/config/{ => localized}/license.coco | 0 .../batch/config/{ => localized}/readme.coco | 0 .../batch/config/localized/tips-nl.coco | 8 ++++++++ .../batch/config/{ => localized}/tips.coco | 0 .../coco-dev-setup/batch/localisation/de.coco | 13 ++++++++++++- .../coco-dev-setup/batch/localisation/en.coco | 6 +++++- .../coco-dev-setup/batch/localisation/nl.coco | 6 +++++- .../coco-dev-setup/batch/localisation/ru.coco | 6 +++++- .../coco-dev-setup/batch/localisation/zh-HANS.coco | 13 ++++++++++++- .../coco-dev-setup/batch/localisation/zh-HANT.coco | 13 ++++++++++++- .../coco-dev-setup/batch/scripts/get_language.bat | 11 +++++++---- .../batch/scripts/print_localized_file.bat | 8 ++++++++ .../coco-dev-setup/batch/scripts/print_tips.bat | 2 +- .../windows/coco-dev-setup/batch/scripts/setup.bat | 7 ++++--- 15 files changed, 80 insertions(+), 15 deletions(-) rename scripts/windows/coco-dev-setup/batch/config/{ => localized}/license.coco (100%) rename scripts/windows/coco-dev-setup/batch/config/{ => localized}/readme.coco (100%) create mode 100755 scripts/windows/coco-dev-setup/batch/config/localized/tips-nl.coco rename scripts/windows/coco-dev-setup/batch/config/{ => localized}/tips.coco (100%) create mode 100755 scripts/windows/coco-dev-setup/batch/scripts/print_localized_file.bat diff --git a/scripts/windows/coco-dev-setup/batch/config/config.coco b/scripts/windows/coco-dev-setup/batch/config/config.coco index eab3e07a0..da381689f 100755 --- a/scripts/windows/coco-dev-setup/batch/config/config.coco +++ b/scripts/windows/coco-dev-setup/batch/config/config.coco @@ -1,6 +1,6 @@ - 3.4 + 3.5 GlenDC CodeCombat.com 2013-2014 https://github.com/codecombat/codecombat.git diff --git a/scripts/windows/coco-dev-setup/batch/config/license.coco b/scripts/windows/coco-dev-setup/batch/config/localized/license.coco similarity index 100% rename from scripts/windows/coco-dev-setup/batch/config/license.coco rename to scripts/windows/coco-dev-setup/batch/config/localized/license.coco diff --git a/scripts/windows/coco-dev-setup/batch/config/readme.coco b/scripts/windows/coco-dev-setup/batch/config/localized/readme.coco similarity index 100% rename from scripts/windows/coco-dev-setup/batch/config/readme.coco rename to scripts/windows/coco-dev-setup/batch/config/localized/readme.coco diff --git a/scripts/windows/coco-dev-setup/batch/config/localized/tips-nl.coco b/scripts/windows/coco-dev-setup/batch/config/localized/tips-nl.coco new file mode 100755 index 000000000..bc12d3bf5 --- /dev/null +++ b/scripts/windows/coco-dev-setup/batch/config/localized/tips-nl.coco @@ -0,0 +1,8 @@ + 1) Antwoord voorzichtig en juist, indien er een vraag gesteld wordt. + 2) Deze installatie is nog steeds in beta en kan bugs bevatten. + 3) Rapporteer bugs op 'https://github.com/codecombat/codecombat/issues' + 4) Heb je vragen of suggesties? Praat met ons op HipChat via CodeCombat.com + + Je kan een Engelstalige stappengids + voor deze installatie vinden op onze wiki: + github.com/codecombat/codecombat/wiki/Setup-on-Windows:-a-step-by-step-guide \ No newline at end of file diff --git a/scripts/windows/coco-dev-setup/batch/config/tips.coco b/scripts/windows/coco-dev-setup/batch/config/localized/tips.coco similarity index 100% rename from scripts/windows/coco-dev-setup/batch/config/tips.coco rename to scripts/windows/coco-dev-setup/batch/config/localized/tips.coco diff --git a/scripts/windows/coco-dev-setup/batch/localisation/de.coco b/scripts/windows/coco-dev-setup/batch/localisation/de.coco index e8af90621..fb8f1fce6 100755 --- a/scripts/windows/coco-dev-setup/batch/localisation/de.coco +++ b/scripts/windows/coco-dev-setup/batch/localisation/de.coco @@ -3,8 +3,12 @@ Deutsch German - Ab jetzt senden wir unser Feedback in Englisch! + Before we start the installation, here are some tips: + + You have choosen Deutsch as your language. + Ab jetzt senden wir unser Feedback in Deutsch. + -Bit System erkannt. @@ -52,6 +56,13 @@ Bitte gebe den kompletten Pfad zur Git Bash ein, oder drücke Enter, um den Standardpfad zu verwenden Willst du das Repository via SSH auschecken? + + You should have forked CodeCombat to your own GitHub Account by now... + Please enter your github information, to configure your local repository. + Username: + Password: + Thank you... Configuring your local repistory right now... + The installation of your local environment was succesfull! diff --git a/scripts/windows/coco-dev-setup/batch/localisation/en.coco b/scripts/windows/coco-dev-setup/batch/localisation/en.coco index 46464bb55..d763e34a5 100755 --- a/scripts/windows/coco-dev-setup/batch/localisation/en.coco +++ b/scripts/windows/coco-dev-setup/batch/localisation/en.coco @@ -3,8 +3,12 @@ English English - From now on we'll send our feedback in English! + Before we start the installation, here are some tips: + + You have choosen English as your language. + From now on we'll send our feedback in English. + -bit computer detected. diff --git a/scripts/windows/coco-dev-setup/batch/localisation/nl.coco b/scripts/windows/coco-dev-setup/batch/localisation/nl.coco index 501a4e339..971caf048 100755 --- a/scripts/windows/coco-dev-setup/batch/localisation/nl.coco +++ b/scripts/windows/coco-dev-setup/batch/localisation/nl.coco @@ -3,8 +3,12 @@ Nederlands Dutch - Vanaf nu geven we onze feedback in het Nederlands! + Voor we verder gaan met de installatie hier volgen enkele tips: + + Je hebt Nederlands gekozen als jouw taal naar keuze. + Vanaf nu geven we onze feedback in het Nederlands. + -bit computer gedetecteerd. diff --git a/scripts/windows/coco-dev-setup/batch/localisation/ru.coco b/scripts/windows/coco-dev-setup/batch/localisation/ru.coco index 37e9d0b2f..e7fc59f3e 100644 --- a/scripts/windows/coco-dev-setup/batch/localisation/ru.coco +++ b/scripts/windows/coco-dev-setup/batch/localisation/ru.coco @@ -3,8 +3,12 @@ Russian - C ! + Before we start the installation, here are some tips: + + You have choosen as your language. + C . + - . diff --git a/scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco b/scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco index 410d032f7..29f8977e7 100755 --- a/scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco +++ b/scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco @@ -3,8 +3,12 @@ 简体中文 Traditional Chinese - 目前我们只能用英文给你反馈！ + Before we start the installation, here are some tips: + + You have choosen 简体中文 as your language. + 目前我们只能用英文给你反馈 + -位系统. @@ -52,6 +56,13 @@ 请输入 git bash 的安装全路径, 如果你安装的是默认路径, 那么直接输入回车即可 你是否想使用 ssh 来检出(checkout)库(repository)? + + You should have forked CodeCombat to your own GitHub Account by now... + Please enter your github information, to configure your local repository. + Username: + Password: + Thank you... Configuring your local repistory right now... + The installation of your local environment was succesfull! diff --git a/scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco b/scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco index 8c242effa..efb024647 100755 --- a/scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco +++ b/scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco @@ -3,8 +3,12 @@ 繁体中文 Simplified Chinese - From now on we'll send our feedback in English! + Before we start the installation, here are some tips: + + You have choosen 繁体中文 as your language. + From now on we'll send our feedback in 繁体中文. + -bit computer detected. @@ -52,6 +56,13 @@ Please enter the full path where git bash is installed or just press enter if it's in the default location Do you want to checkout the repository via ssh? + + You should have forked CodeCombat to your own GitHub Account by now... + Please enter your github information, to configure your local repository. + Username: + Password: + Thank you... Configuring your local repistory right now... + The installation of your local environment was succesfull! diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_language.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_language.bat index fa66aafc8..96da622e9 100755 --- a/scripts/windows/coco-dev-setup/batch/scripts/get_language.bat +++ b/scripts/windows/coco-dev-setup/batch/scripts/get_language.bat @@ -27,10 +27,13 @@ goto:get_localisation_id goto:get_localisation_id ) else ( set language_id=!languages[%local_id%]! - call get_text !language_id! global_native global native call print_dashed_seperator - echo You have choosen !global_native! as your language. - call get_text !language_id! global_intro global intro - echo !global_intro! + + call get_local_text language_choosen language choosen + echo !language_choosen! + + call get_local_text language_feedback language feedback + echo !language_feedback! + call print_seperator ) \ No newline at end of file diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_localized_file.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_localized_file.bat new file mode 100755 index 000000000..14c74e7a7 --- /dev/null +++ b/scripts/windows/coco-dev-setup/batch/scripts/print_localized_file.bat @@ -0,0 +1,8 @@ +set "LFTP=%1-%language_id%.coco" +if not exist "%LFTP%" ( + echo printing %1.coco... + call print_file %1.coco +) else ( + echo printing %LFTP%... + call print_file %LFTP% +) \ No newline at end of file diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat index c00833574..0a2e3033a 100755 --- a/scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat +++ b/scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat @@ -1 +1 @@ -print_file ..\\config\\tips.coco \ No newline at end of file +call print_localized_file ..\\config\\localized\\tips \ No newline at end of file diff --git a/scripts/windows/coco-dev-setup/batch/scripts/setup.bat b/scripts/windows/coco-dev-setup/batch/scripts/setup.bat index 9ac1c55df..b8ad678bc 100755 --- a/scripts/windows/coco-dev-setup/batch/scripts/setup.bat +++ b/scripts/windows/coco-dev-setup/batch/scripts/setup.bat @@ -13,14 +13,15 @@ echo Welcome to the automated Installation of the CodeCombat Dev. Environment! echo v%version% authored by %author% and published by %copyright%. call print_seperator -echo Before we start the installation, here are some tips: +call get_language + +call get_local_text global_tips global tips +echo !global_tips! call print_tips call print_seperator call sign_license -call get_language - call download_and_install_applications start cmd /c "setup_p2.bat"