More refactoring. localisation works almost again, and fixed some caused by previous refactoring.

This commit is contained in:
Glen De Cauwsemaecker 2014-04-04 01:27:15 +02:00
parent 6f2cfbf1e8
commit ed12b644ca
10 changed files with 85 additions and 85 deletions

View file

@ -3,4 +3,6 @@
<version>1.0</version>
<author>GlenDC</author>
<copyright>CodeCombat.com © 2013-2014</copyright>
<github_url>https://github.com/codecombat/codecombat.git</github_url>
<github_ssh>git@github.com:codecombat/codecombat.git</github_ssh>
</variables>

View file

@ -4,4 +4,4 @@
4) Having questions/suggestions? Talk with us on HipChat via CodeCombat.com
You can find a step-by-step guide for this installation on our wiki.
https://github.com/codecombat/codecombat/wiki/<guide_path>
github.com/codecombat/codecombat/wiki/Setup-on-Windows:-a-step-by-step-guide

View file

@ -30,16 +30,16 @@
</install>
<github>
<intro>
<opensource>Wie Du bereits weißt, ist CodeCombat Open Source.
<online>Unser Quellcode ist komplett auf Github.
<manual>Wenn Du möchtest, kannst du das komplette Git Repository selbst herunterladen und nach deinen wünschen einrichten.
<norec>Allerdings empfehlen wir, dass du den Prozess statt dessen uns überlässt.
<opensource>Wie Du bereits weißt, ist CodeCombat Open Source.</opensource>
<online>Unser Quellcode ist komplett auf Github.</online>
<manual>Wenn Du möchtest, kannst du das komplette Git Repository selbst herunterladen und nach deinen wünschen einrichten.</manual>
<norec>Allerdings empfehlen wir, dass du den Prozess statt dessen uns überlässt.</norec>
</intro>
<skip>
<question>Willst du das lokale Git Setup selbst vornehmen?
<consequence>Bit vergewissere dich, dass das Repository korrekt heruntergeladen wurde, bevor du fortfährst.
<donotclose>Bitte schließe dieses Fenster nicht.
<wait>Wenn du fertig bist, drücke eine beliebige Taste zum Fortfahren...
<question>Willst du das lokale Git Setup selbst vornehmen?</question>
<consequence>Bit vergewissere dich, dass das Repository korrekt heruntergeladen wurde, bevor du fortfährst.</consequence>
<donotclose>Bitte schließe dieses Fenster nicht.</donotclose>
<wait>Wenn du fertig bist, drücke eine beliebige Taste zum Fortfahren...</wait>
</skip>
<process>
<path>Gebe bitte den kompletten Pfad zu deinem CodeCombat Git Repository ein: </path>
@ -62,7 +62,7 @@
<script>Preparing the automatic startup script for you...</script>
</npm>
<error>
<path>Dieser Pfad existiert bereits. Willst du ihn wirklich überschreiben?<path>
<path>Dieser Pfad existiert bereits. Willst du ihn wirklich überschreiben?</path>
<exist>Dieser Pfad exisitert nicht. Bitte versuche es erneut...</exist>
</error>
<end>

View file

@ -15,10 +15,10 @@
<sks>Have you already installed all the software needed for CodeCombat?</sks>
<skq>We recommand that you reply negative in case you're not sure.</skq>
<skc>Skipping the installation of the software...</skc>
<1>CodeCombat couldn't be developed without third-party software.</1>
<2>That's why you'll need to install this software,</2>
<3>in order to start contributing to our community.</3>
<4>Cancel the installation if you already have the application.</4>
<s1>CodeCombat couldn't be developed without third-party software.</s1>
<s2>That's why you'll need to install this software,</s2>
<s3>in order to start contributing to our community.</s3>
<s4>Cancel the installation if you already have the application.</s4>
<prefix>Do you already have the latest version of</prefix>
<sufix>installed?</sufix>
<downloading>is downloading...</downloading>
@ -71,11 +71,11 @@
<readme>Do you want to read the README for more information?</readme>
</end>
<start>
<1>From now on you can start the dev. environment at</1>
<2>the touch of a single mouse click.</2>
<3> 1) Just double click</3>
<4> and let the environment start up.</4>
<5> 2) Now just open 'localhost:3000' in your prefered browser.</5>
<6>That's it, you're now ready to start working on CodeCombat!</6>
<s1>From now on you can start the dev. environment at</s1>
<s2>the touch of a single mouse click.</s2>
<s3> 1) Just double click</s3>
<s4> and let the environment start up.</s4>
<s5> 2) Now just open 'localhost:3000' in your prefered browser.</s5>
<s6>That's it, you're now ready to start working on CodeCombat!</s6>
</start>
</variables>

View file

@ -15,10 +15,10 @@
<sks>Heb je alle benodige software al geinstalleerd?</sks>
<skq>We raden aan dat je negatief antwoord indien je niet zeker bent.</skq>
<skc>De installatie van software wordt geanulleerd...</skc>
<1>CodeCombat kon niet worden ontwikkeld zonder third-party software.</1>
<2>Dat is waarom je deze software moet installeren,</2>
<3>zodat je je kan beginnen met het bijdragen tot onze gemeenschap.</3>
<4>Annuleer de installatie als je de applicatie al hebt.</4>
<s1>CodeCombat kon niet worden ontwikkeld zonder third-party software.</s1>
<s2>Dat is waarom je deze software moet installeren,</s2>
<s3>zodat je je kan beginnen met het bijdragen tot onze gemeenschap.</s3>
<s4>Annuleer de installatie als je de applicatie al hebt.</s4>
<prefix>Heb je al de laatste versie van</prefix>
<sufix>geinstalleerd?</sufix>
<downloading>is aan het downloaden...</downloading>
@ -71,11 +71,11 @@
<readme>Wil je de LEESMIJ lezen voor meer informatie?</readme>
</end>
<start>
<1>Vanaf nu kan je de ontwikkelings omgeving opstarten</1>
<2>met het gemak van een enkele muisklik.</2>
<3> 1) Dubbelklik op</3>
<4>en laat de omgeving opstarten.</4>
<5> 2) Nu kan je 'localhost:3000' openen in je browser naar voorkeur.</5>
<6>Dat is het, je bent nu klaar om te starten met je werk aan CodeCombat.</6>
<s1>Vanaf nu kan je de ontwikkelings omgeving opstarten</s1>
<s2>met het gemak van een enkele muisklik.</s2>
<s3> 1) Dubbelklik op</s3>
<s4>en laat de omgeving opstarten.</s4>
<s5> 2) Nu kan je 'localhost:3000' openen in je browser naar voorkeur.</s5>
<s6>Dat is het, je bent nu klaar om te starten met je werk aan CodeCombat.</s6>
</start>
</variables>

View file

@ -6,8 +6,8 @@ if NOT exist "%temp_directory%" (
md %temp_directory%
)
call get_local_text install-process-prefix
call get_local_text install-process-sufix
call get_local_text install_process_prefix install process prefix
call get_local_text install_process_sufix install process sufix
call ask_question "!install_process_prefix! %1 !install_process_sufix!"
@ -18,7 +18,7 @@ if "%result%"=="true" (
call print_dashed_seperator
call get_extension %2 download_extension
call get_local_text install-process-downloading
call get_local_text install_process_downloading install process downloading
echo %1 !install_process_downloading!
set "install_file=!temp_directory!%1.!download_extension!"
%curl_app% -k %2 -o !install_file!
@ -34,10 +34,10 @@ if "%download_extension%"=="zip" (
goto:get_mongodb_path
:get_mongodb_path
call get_local_text install-process-mongodbpath
call get_local_text install_process_mongodbpath install process mongodbpath
set /p "mongodb_path=!install_process_mongodbpath!: "
if exist "%mongodb_path%" (
call get_local_text error-path
call get_local_text error_path error path
call ask_question "!error_path!"
if "!result!"=="false" (
call print_dashed_seperator
@ -52,14 +52,14 @@ if "%download_extension%"=="zip" (
goto:clean_up
)
call get_local_text install-process-installing
call get_local_text install_process_installing install process installing
echo %1 !install_process_installing!
echo.
start /WAIT !install_file!
goto:clean_up
:clean_up
call get_local_text install-process-cleaning
call get_local_text install_process_cleaning install process cleaning
echo %1 !install_process_cleaning!
rmdir /s /q "!temp_directory!"
goto:exit_installation

View file

@ -1,16 +1,16 @@
call print_install_header
call print_dashed_seperator
call get_local_text install-process-sks
call get_local_text install_process_sks install process sks
echo !install_process_sks!
call get_local_text install-process-skq
call get_local_text install_process_skq install process skq
call ask_question "!install_process_skq!"
call print_dashed_seperator
if "%result%"=="true" (
call get_local_text install-process-skc
call get_local_text install_process_skc install process skc
echo !install_process_skc!
call print_dashed_seperator
goto:exit_setup
@ -20,22 +20,22 @@ call get_system_information
call print_dashed_seperator
if %system_info_os% == XP (
call get_local_text install-system-xp
call get_local_text install_system_xp install system xp
echo !install_system_xp!
call print_exit
)
call get_category ..\\config\\downloads.coco downloads download_names downloads_count general-general general-%system_info_bit% %system_info_os%-%system_info_bit%
call get_local_text install-process-1
call get_local_text install-process-2
call get_local_text install-process-3
call get_local_text install-process-4
call get_local_text install_process_s1 install process s1
call get_local_text install_process_s2 install process s2
call get_local_text install_process_s3 install process s3
call get_local_text install_process_s4 install process s4
echo !install_process_1!
echo !install_process_2!
echo !install_process_3!
echo !install_process_4!
echo !install_process_s1!
echo !install_process_s2!
echo !install_process_s3!
echo !install_process_s4!
call print_dashed_seperator

View file

@ -16,15 +16,15 @@ if "%version%" == "6.3" ( call:set_os Win7 )
goto:end
:set_bit
call get_local_text install-system-bit
call get_local_text install_system_bit install system bit
set system_info_bit=%~1
echo %system_info_bit%%install_system_bit%
goto:eof
:set_os
set system_info_os=%~1
call get_local_text install-system-prefix
call get_local_text install-system-sufix
call get_local_text install_system_prefix install system prefix
call get_local_text install_system_sufix install system sufix
echo %install_system_prefix% %system_info_os% %install_system_sufix%
goto:eof

View file

@ -1,10 +1,10 @@
call print_github_header
call print_dashed_seperator
call get_local_text github-intro-opensource
call get_local_text github-intro-online
call get_local_text github-intro-manual
call get_local_text github-intro-norec
call get_local_text github_intro_opensource github intro opensource
call get_local_text github_intro_online github intro online
call get_local_text github_intro_manual github intro manual
call get_local_text github_intro_norec github intro norec
echo !github_intro_opensource!
echo !github_intro_online!
@ -13,23 +13,23 @@ echo !github_intro_norec!
call print_dashed_seperator
call get_local_text github-skip-question
call get_local_text github_skip_question github skip question
call ask_question "!github_skip_question!"
call print_dashed_seperator
if "%result%"=="true" (
call get_local_text github-skip-consequence
call get_local_text github_skip_consequence github skip consequence
echo !github_skip_consequence!
call get_local_text github-skip-donotclose
call get_local_text github_skip_donotclose github skip donotclose
echo !github_skip_donotclose!
call get_local_text github-skip-wait
call get_local_text github_skip_wait github skip wait
set /p "github_skip_wait=!github_skip_wait!"
call print_dashed_seperator
call get_local_text github-process-path
call get_local_text github_process_path github process path
call get_path_safe "!github_process_path!"
set "repository_path=!tmp_safe_path!"
@ -39,7 +39,7 @@ if "%result%"=="true" (
goto:get_bash_path
:get_bash_path
call get_local_text github-process-bashi
call get_local_text github_process_bashi github process bashi
echo !github_process_bashi!
if not defined install_system_bit (
@ -49,14 +49,14 @@ goto:get_bash_path
)
if "%system_info_bit%"=="64" (
call get_local_text github-process-bashp64
call get_local_text github_process_bashp64 github process bashp64
echo !github_process_bashp64!
) else (
call get_local_text github-process-bashp32
call get_local_text github_process_bashp32 github process bashp32
echo !github_process_bashp32!
)
call get_local_text github-process-bashq
call get_local_text github_process_bashq github process bashq
set /p "git_bash_path=!github_process_bashq!: "
if not defined git_bash_path (
@ -69,7 +69,7 @@ goto:get_bash_path
)
if not exist "%git_bash_path%" (
call get_local_text error-exist
call get_local_text error_exist error exist
echo !error_exist!
call print_dashed_seperator
goto:get_bash_path
@ -80,10 +80,10 @@ goto:eof
:get_git_path
call print_dashed_seperator
call get_local_text github-process-checkout
call get_local_text github_process_checkout github process checkout
set /p "repository_path=!github_process_checkout!: "
if exist !repository_path! (
call get_local_text error-path
call get_local_text error_path error path
call ask_question "!error_path!"
if "!result!"=="false" (
call print_dashed_seperator

View file

@ -14,8 +14,6 @@ echo Welcome to the automated Installation of the CodeCombat Dev. Environment!
echo v%version% authored by %author% and published by %copyright%.
call print_seperator
pause
echo Before we start the installation, here are some tips:
call print_tips
call print_seperator
@ -34,32 +32,32 @@ call github_setup
call print_finished_header
call print_dashed_seperator
call get_local_text end-succesfull
call get_local_text end-thankyou
call get_local_text end_succesfull end succesfull
call get_local_text end_thankyou end_thankyou
echo %end_succesfull%
echo %end_thankyou%
call print_dashed_seperator
call get_local_text start-1
call get_local_text start-2
call get_local_text start-3
call get_local_text start-4
call get_local_text start-5
call get_local_text start-6
call get_local_text start_s1 start s1
call get_local_text start_s2 start s2
call get_local_text start_s3 start s3
call get_local_text start_s4 start s4
call get_local_text start_s5 start s5
call get_local_text start_s6 start s6
echo !start_1!
echo !start_2!
echo !start_s1!
echo !start_s2!
echo.
echo !start_3! '!repository_path!\coco\SCOCODE.bat'
echo !start_4!
echo !start_5!
echo !start_s3! '!repository_path!\coco\SCOCODE.bat'
echo !start_s4!
echo !start_s5!
echo.
echo !start_6!
echo !start_s6!
call print_dashed_seperator
call get_local_text end-readme
call get_local_text end_readme end readme
call ask_question "!end_readme!"
if "%result%"=="true" (