[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2730: Default to the language chosen by the user during install (W (vidalia/trunk/pkg/win32)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r2730: Default to the language chosen by the user during install (W (vidalia/trunk/pkg/win32)
From: edmanm@xxxxxxxxxxxxxxxxxxx
Date: Sat, 14 Jun 2008 22:44:02 -0400 (EDT)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Sat, 14 Jun 2008 22:44:07 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx
Author: edmanm
Date: 2008-06-14 22:44:02 -0400 (Sat, 14 Jun 2008)
New Revision: 2730

Modified:
   vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
   vidalia/trunk/pkg/win32/vidalia.nsi.in
   vidalia/trunk/pkg/win32/vidalia_cs.nsh
   vidalia/trunk/pkg/win32/vidalia_de.nsh
   vidalia/trunk/pkg/win32/vidalia_en.nsh
   vidalia/trunk/pkg/win32/vidalia_es.nsh
   vidalia/trunk/pkg/win32/vidalia_fa.nsh
   vidalia/trunk/pkg/win32/vidalia_fi.nsh
   vidalia/trunk/pkg/win32/vidalia_fr.nsh
   vidalia/trunk/pkg/win32/vidalia_he.nsh
   vidalia/trunk/pkg/win32/vidalia_it.nsh
   vidalia/trunk/pkg/win32/vidalia_nl.nsh
   vidalia/trunk/pkg/win32/vidalia_pl.nsh
   vidalia/trunk/pkg/win32/vidalia_pt-br.nsh
   vidalia/trunk/pkg/win32/vidalia_ru.nsh
   vidalia/trunk/pkg/win32/vidalia_sv.nsh
   vidalia/trunk/pkg/win32/vidalia_zh-cn.nsh
   vidalia/trunk/pkg/win32/vidalia_zh-tw.nsh
Log:
Default to the language chosen by the user during install (Windows-only) rather
than the system language. (Ticket #246)


Modified: vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia-bundle.nsi.in	2008-06-15 02:44:02 UTC (rev 2730)
@@ -194,6 +194,7 @@
       Call StrRep
       Pop $R0 ; contains the modified version of $INSTDIR
       WriteINIStr "$APPDATA\Vidalia\vidalia.conf" Tor TorExecutable "$R0\\Tor\\${TOR_EXEC}"
+      WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General LanguageCode "$(LanguageCode)"
 
       ; Write the uninstall keys for Windows  
       SetShellVarContext all

Modified: vidalia/trunk/pkg/win32/vidalia.nsi.in
===================================================================
--- vidalia/trunk/pkg/win32/vidalia.nsi.in	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia.nsi.in	2008-06-15 02:44:02 UTC (rev 2730)
@@ -152,6 +152,9 @@
   ; Include a prebuilt GeoIP cache
   SetOutPath "$APPDATA\Vidalia"
   File "@CMAKE_CURRENT_SOURCE_DIR@\geoip-cache"
+  
+  ; Save the chosen language code
+  WriteINIStr "$APPDATA\Vidalia\vidalia.conf" General LanguageCode "$(LanguageCode)"
 
   ; Write the uninstall keys for Windows
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${VIDALIA_NAME}" "DisplayName" "${VIDALIA_DESC}"

Modified: vidalia/trunk/pkg/win32/vidalia_cs.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_cs.nsh	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia_cs.nsh	2008-06-15 02:44:02 UTC (rev 2730)
@@ -56,3 +56,4 @@
 ; Miscellaneous Strings
 LangString AppData                    ${LANG_CZECH} "Application Data"
 LangString AppDataUninstDesc          ${LANG_CZECH} "Remove saved application data and configuration files."
+LangString LanguageCode               ${LANG_CZECH} "cz"

Modified: vidalia/trunk/pkg/win32/vidalia_de.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_de.nsh	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia_de.nsh	2008-06-15 02:44:02 UTC (rev 2730)
@@ -58,3 +58,4 @@
 ; Miscellaneous Strings
 LangString AppData                    ${LANG_GERMAN} "Anwendungsdaten"
 LangString AppDataUninstDesc          ${LANG_GERMAN} "Entferne gespeicherte Anwendungsdaten und Konfigurationsdateien."
+LangString LanguageCode               ${LANG_GERMAN} "de"

Modified: vidalia/trunk/pkg/win32/vidalia_en.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_en.nsh	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia_en.nsh	2008-06-15 02:44:02 UTC (rev 2730)
@@ -76,4 +76,4 @@
 ; Miscellaneous Strings
 LangString AppData                    ${LANG_ENGLISH} "Application Data"
 LangString AppDataUninstDesc          ${LANG_ENGLISH} "Remove saved application data and configuration files."
-
+LangString LanguageCode               ${LANG_ENGLISH} "en"

Modified: vidalia/trunk/pkg/win32/vidalia_es.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_es.nsh	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia_es.nsh	2008-06-15 02:44:02 UTC (rev 2730)
@@ -56,3 +56,4 @@
 ; Miscellaneous Strings
 LangString AppData                    ${LANG_SPANISH} "Application Data"
 LangString AppDataUninstDesc          ${LANG_SPANISH} "Remove saved application data and configuration files."
+LangString LanguageCode               ${LANG_SPANISH} "es"

Modified: vidalia/trunk/pkg/win32/vidalia_fa.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_fa.nsh	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia_fa.nsh	2008-06-15 02:44:02 UTC (rev 2730)
@@ -56,3 +56,4 @@
 ; Miscellaneous Strings
 LangString AppData                    ${LANG_FARSI} "Application Data"
 LangString AppDataUninstDesc          ${LANG_FARSI} "Remove saved application data and configuration files."
+LangString LanguageCode               ${LANG_FARSI} "fa"

Modified: vidalia/trunk/pkg/win32/vidalia_fi.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_fi.nsh	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia_fi.nsh	2008-06-15 02:44:02 UTC (rev 2730)
@@ -60,3 +60,4 @@
 ; Miscellaneous Strings
 LangString AppData                    ${LANG_FINNISH} "Ohjelmatiedot"
 LangString AppDataUninstDesc          ${LANG_FINNISH} "Poista tallennetut ohjelmatiedot ja asetustiedostot."
+LangString LanguageCode               ${LANG_FINNISH} "fi"

Modified: vidalia/trunk/pkg/win32/vidalia_fr.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_fr.nsh	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia_fr.nsh	2008-06-15 02:44:02 UTC (rev 2730)
@@ -56,3 +56,4 @@
 ; Miscellaneous Strings
 LangString AppData                    ${LANG_FRENCH} "Application Data"
 LangString AppDataUninstDesc          ${LANG_FRENCH} "Remove saved application data and configuration files."
+LangString LanguageCode               ${LANG_FRENCH} "fr"

Modified: vidalia/trunk/pkg/win32/vidalia_he.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_he.nsh	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia_he.nsh	2008-06-15 02:44:02 UTC (rev 2730)
@@ -60,4 +60,4 @@
 ; Miscellaneous Strings
 LangString AppData                    ${LANG_HEBREW} "���"
 LangString AppDataUninstDesc          ${LANG_HEBREW} "� ��� �����
-
+LangString LanguageCode               ${LANG_HEBREW} "he"

Modified: vidalia/trunk/pkg/win32/vidalia_it.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_it.nsh	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia_it.nsh	2008-06-15 02:44:02 UTC (rev 2730)
@@ -59,3 +59,4 @@
 ; Miscellaneous Strings
 LangString AppData                    ${LANG_ITALIAN} "Application Data"
 LangString AppDataUninstDesc          ${LANG_ITALIAN} "Remove saved application data and configuration files."
+LangString LanguageCode               ${LANG_ITALIAN} "it"
\ No newline at end of file

Modified: vidalia/trunk/pkg/win32/vidalia_nl.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_nl.nsh	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia_nl.nsh	2008-06-15 02:44:02 UTC (rev 2730)
@@ -55,3 +55,4 @@
 ; Miscellaneous Strings
 LangString AppData                    ${LANG_DUTCH} "Application Data"
 LangString AppDataUninstDesc          ${LANG_DUTCH} "Remove saved application data and configuration files."
+LangString LanguageCode               ${LANG_DUTCH} "nl"
\ No newline at end of file

Modified: vidalia/trunk/pkg/win32/vidalia_pl.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_pl.nsh	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia_pl.nsh	2008-06-15 02:44:02 UTC (rev 2730)
@@ -56,3 +56,4 @@
 ; Miscellaneous Strings
 LangString AppData                    ${LANG_POLISH} "Dane Aplikacji"
 LangString AppDataUninstDesc          ${LANG_POLISH} "Usu�zystkie dane aplikacji i pliki konfiguracyjne."
+LangString LanguageCode               ${LANG_POLISH} "pl"
\ No newline at end of file

Modified: vidalia/trunk/pkg/win32/vidalia_pt-br.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_pt-br.nsh	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia_pt-br.nsh	2008-06-15 02:44:02 UTC (rev 2730)
@@ -56,3 +56,4 @@
 ; Miscellaneous Strings
 LangString AppData                    ${LANG_PORTUGUESEBR} "Application Data"
 LangString AppDataUninstDesc          ${LANG_PORTUGUESEBR} "Remove saved application data and configuration files."
+LangString LanguageCode               ${LANG_PORTUGUESEBR} "pt-br"
\ No newline at end of file

Modified: vidalia/trunk/pkg/win32/vidalia_ru.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_ru.nsh	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia_ru.nsh	2008-06-15 02:44:02 UTC (rev 2730)
@@ -61,3 +61,4 @@
 ; Miscellaneous Strings
 LangString AppData                    ${LANG_RUSSIAN} "Application Data"
 LangString AppDataUninstDesc          ${LANG_RUSSIAN} "�������������
+LangString LanguageCode               ${LANG_RUSSIAN} "ru"
\ No newline at end of file

Modified: vidalia/trunk/pkg/win32/vidalia_sv.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_sv.nsh	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia_sv.nsh	2008-06-15 02:44:02 UTC (rev 2730)
@@ -56,3 +56,4 @@
 ; Miscellaneous Strings
 LangString AppData                    ${LANG_SWEDISH} "Application Data"
 LangString AppDataUninstDesc          ${LANG_SWEDISH} "Remove saved application data and configuration files."
+LangString LanguageCode               ${LANG_SWEDISH} "svn"

Modified: vidalia/trunk/pkg/win32/vidalia_zh-cn.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_zh-cn.nsh	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia_zh-cn.nsh	2008-06-15 02:44:02 UTC (rev 2730)
@@ -56,3 +56,4 @@
 ; Miscellaneous Strings
 LangString AppData                    ${LANG_SIMPCHINESE} "Application Data"
 LangString AppDataUninstDesc          ${LANG_SIMPCHINESE} "Remove saved application data and configuration files."
+LangString LanguageCode               ${LANG_SIMPCHINESE} "zh-cn"

Modified: vidalia/trunk/pkg/win32/vidalia_zh-tw.nsh
===================================================================
--- vidalia/trunk/pkg/win32/vidalia_zh-tw.nsh	2008-06-15 01:28:55 UTC (rev 2729)
+++ vidalia/trunk/pkg/win32/vidalia_zh-tw.nsh	2008-06-15 02:44:02 UTC (rev 2730)
@@ -56,4 +56,5 @@
 ; Miscellaneous Strings
 LangString AppData                    ${LANG_TRADCHINESE} "Application Data"
 LangString AppDataUninstDesc          ${LANG_TRADCHINESE} "Remove saved application data and configuration files."
+LangString LanguageCode               ${LANG_TRADCHINESE} "zh-tw"
Prev by Author: [vidalia-svn] r2729: Tweak the resize policy for the control panel so the vertica (vidalia/trunk/src/vidalia)
Next by Author: [vidalia-svn] r2731: svn isn't a human language. Also add some newlines at the en (vidalia/trunk/pkg/win32)
Previous by thread: [vidalia-svn] r2729: Tweak the resize policy for the control panel so the vertica (vidalia/trunk/src/vidalia)
Next by thread: [vidalia-svn] r2731: svn isn't a human language. Also add some newlines at the en (vidalia/trunk/pkg/win32)
Index(es):
- Author
- Thread