[gcompris] In progress, the windows installer with po translation does not work yet.

[Bruno Coudoin <bcoudoin src gnome org>]

commit 7d1064105959a7f8b02402742fc4735b9ff27b6a
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Mon Jul 20 01:32:48 2009 +0200

    In progress, the windows installer with po translation does not work yet.

 Makefile.am                       |    5 ++-
 Makefile.mingw.in                 |    6 +++-
 gcompris-installer.nsi.in         |    4 +-
 nsis/langmacros.nsh               |   14 ++++++---
 nsis/translations/english.nsh     |   54 ++++++++++++++++++------------------
 nsis_translations.desktop.in      |    2 -
 tools/create_nsis_translations.pl |   39 +++++++++++++-------------
 7 files changed, 65 insertions(+), 59 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index eee02dc..ed4c758 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,7 +49,7 @@ EXTRA_DIST = \
 	gnome2-macros/gnome-deprecated-macros.m4 \
 	README.mingw README.translators README.windows \
 	config.h.mingw.in Makefile.mingw.in global_win32.mak gcompris.ico gc_admin.ico gcompris-uninstal.ico \
-	gcompris-installer.nsi.in
+	gcompris-installer.nsi.in nsis_translations.desktop.in
 
 distcore = $(PACKAGE)-core-$(VERSION)
 
@@ -83,7 +83,8 @@ dist-hook:
 
 
 CONFIG_CLEAN_FILES = gcompris.desktop gcompris-edit.desktop config.h.mingw \
-			gcompris-installer.nsi Makefile.mingw
+			gcompris-installer.nsi Makefile.mingw \
+			nsis_translations.desktop
 
 clean-local:
 	rm -f intltool-extract intltool-merge intltool-update
diff --git a/Makefile.mingw.in b/Makefile.mingw.in
index 0282568..95a3da4 100644
--- a/Makefile.mingw.in
+++ b/Makefile.mingw.in
@@ -72,8 +72,12 @@ config.h: config.h.mingw.in
 	./config.status config.h.mingw
 	cp config.h.mingw config.h
 
-gcompris-installer.nsi: gcompris-installer.nsi.in
+gcompris-installer.nsi: gcompris-installer.nsi.in nsis_translations.desktop
 	./config.status gcompris-installer.nsi
+	./tools/create_nsis_translations.pl
+
+nsis_translations.desktop: nsis_translations.desktop.in
+	LC_ALL=C /usr/bin/intltool-merge -d -u -c ./po/.intltool-merge-cache ./po nsis_translations.desktop.in nsis_translations.desktop
 
 install: all Makefile.mingw
 	mkdir -p $(GCOMPRIS_INSTALL_DIR)/share
diff --git a/gcompris-installer.nsi.in b/gcompris-installer.nsi.in
index a8902a5..60ce894 100644
--- a/gcompris-installer.nsi.in
+++ b/gcompris-installer.nsi.in
@@ -101,10 +101,10 @@ SetDateSave on
 ;--------------------------------
 ;Translations
 
-  !define GCOMPRIS_DEFAULT_LANGFILE "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\english.nsh"
-
   !include "${GCOMPRIS_NSIS_INCLUDE_PATH}\langmacros.nsh"
 
+  !define GCOMPRIS_DEFAULT_LANGFILE "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\english.nsh"
+
   @GCOMPRIS_MACRO_INCLUDE_LANGFILE@
 
 ;--------------------------------
diff --git a/nsis/langmacros.nsh b/nsis/langmacros.nsh
index 08dc35b..0dfdd97 100755
--- a/nsis/langmacros.nsh
+++ b/nsis/langmacros.nsh
@@ -2,6 +2,15 @@
 ;; Windows Gcompris NSIS installer language macros
 ;;
 
+!macro GCOMPRIS_MACRO_DEFAULT_STRING LABEL VALUE
+  !ifndef "${LABEL}"
+    !define "${LABEL}" "${VALUE}"
+    !ifdef INSERT_DEFAULT
+      !warning "${LANG} lang file mising ${LABEL}, using default.."
+    !endif
+  !endif
+!macroend
+
 !macro GCOMPRIS_MACRO_LANGSTRING_INSERT LABEL LANG
   LangString "${LABEL}" "${LANG_${LANG}}" "${${LABEL}}"
   !undef "${LABEL}"
@@ -27,15 +36,10 @@
   !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisLicenseButton		${CUR_LANG}
   !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisLicenseBottomText	${CUR_LANG}
 
-  ; Components Page
-  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisSectionTitle		${CUR_LANG}
-  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisSectionDescription	${CUR_LANG}
-
   ; Installer Finish Page
   !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisFinishVisitWebSite	${CUR_LANG}
 
   ; Gcompris Section Prompts and Texts
-  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisUninstallDesc	${CUR_LANG}
   !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisPromptWipeout	${CUR_LANG}
   !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisPromptDirExists	${CUR_LANG}
 
diff --git a/nsis/translations/english.nsh b/nsis/translations/english.nsh
index d4a4ff6..e4b24c5 100644
--- a/nsis/translations/english.nsh
+++ b/nsis/translations/english.nsh
@@ -1,27 +1,27 @@
-;;
-;;  english.nsh
-;;
-;;  Default language strings for the Windows GCompris NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Version 3
-;;  Note: If translating this file, replace "!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING"
-;;  with "!define".
-
-; Make sure to update the GCOMPRIS_MACRO_LANGUAGEFILE_END macro in
-; langmacros.nsh when updating this file
-
-; Startup Checks
-!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING INSTALLER_IS_RUNNING			"The installer is already running."
-!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING GCOMPRIS_IS_RUNNING			"An instance of GCompris is currently running. Exit GCompris and then try again."
-
-; Installer Finish Page
-!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING GCOMPRIS_FINISH_VISIT_WEB_SITE		"Visit the Windows GCompris Web Page"
-
-; GCompris Section Prompts and Texts
-!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING GCOMPRIS_PROMPT_WIPEOUT			"Your old GCompris directory is about to be deleted. Would you like to continue?$\r$\rNote: Any non-standard plugins that you may have installed will be deleted.$\rGCompris user settings will not be affected."
-!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING GCOMPRIS_PROMPT_DIR_EXISTS		"The installation directory you specified already exists. Any contents$\rwill be deleted. Would you like to continue?"
-
-; Uninstall Section Prompts
-!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING un.GCOMPRIS_UNINSTALL_ERROR_1		"The uninstaller could not find registry entries for GCompris.$\rIt is likely that another user installed this application."
-!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING un.GCOMPRIS_UNINSTALL_ERROR_2		"You do not have permission to uninstall this application."
+;;
+;;  english.nsh
+;;
+;;  Default language strings for the Windows GCompris NSIS installer.
+;;  Windows Code page: 1252
+;;
+;;  Version 3
+;;  Note: If translating this file, replace "!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING"
+;;  with "!define".
+
+; Make sure to update the GCOMPRIS_MACRO_LANGUAGEFILE_END macro in
+; langmacros.nsh when updating this file
+
+; Startup Checks
+!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING InstallerIsRunning	"The installer is already running."
+!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING GcomprisIsRunning	"An instance of GCompris is currently running. Exit GCompris and then try again."
+
+; Installer Finish Page
+!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING GcomprisFinishVisitWebSite	"Visit the Windows GCompris Web Page"
+
+; GCompris Section Prompts and Texts
+!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING GcomprisPromptWipeout	"Your old GCompris directory is about to be deleted. Would you like to continue?$\r$\rNote: Any non-standard plugins that you may have installed will be deleted.$\rGCompris user settings will not be affected."
+!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING GcomprisPromptDirExists	"The installation directory you specified already exists. Any contents$\rwill be deleted. Would you like to continue?"
+
+; Uninstall Section Prompts
+!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING unGcomprisUninstallError1	"The uninstaller could not find registry entries for GCompris.$\rIt is likely that another user installed this application."
+!insertmacro GCOMPRIS_MACRO_DEFAULT_STRING unGcomprisUninstallError2	"You do not have permission to uninstall this application."
diff --git a/nsis_translations.desktop.in b/nsis_translations.desktop.in
index 78ac252..beb5d49 100644
--- a/nsis_translations.desktop.in
+++ b/nsis_translations.desktop.in
@@ -4,9 +4,7 @@ _InstallerIsRunning=The installer is already running.
 _GcomprisisRunning=An instance of GCompris is currently running. Exit GCompris and then try again.
 _GcomprisLicenseButton=Next >
 _GcomprisLicenseBottomText=GCompris is released under the GNU General Public License (GPL). The license is provided here for information purposes only. \$_CLICK
-_GcomprisSectionDescription=Core GCompris files and dlls
 _GcomprisFinishVisitWebSite=Visit the Windows GCompris Web Page
-_GcomprisUninstallDesc=GCompris (remove only)
 _GcomprisPromptWipeout=Your old GCompris directory is about to be deleted. Would you like to continue?$\\r$\\rNote: Any non-standard plugins that you may have installed will be deleted.$\\rGCompris user settings will not be affected.
 _GcomprisPromptDirExists=The installation directory you specified already exists. Any contents$\\rwill be deleted. Would you like to continue?
 _unGCOMPRISUninstallError1=the uninstaller could not find registry entries for GCompris.$\\rIt is likely that another user installed this application.
diff --git a/tools/create_nsis_translations.pl b/tools/create_nsis_translations.pl
index ed43b6d..cc3e390 100755
--- a/tools/create_nsis_translations.pl
+++ b/tools/create_nsis_translations.pl
@@ -11,63 +11,62 @@ my @ALL_LINGUAS       = split(' ', $ALL_LINGUAS_STR);
 
 my %localeNames = (
   "af", "Afrikaans",
-  "am", "Amharic",
+#  "am", "Amharic",
   "ar", "Arabic",
-  "az", "Turkish",
   "bg",	"Bulgarian",
   "br",	"Breton",
   "ca",	"Catalan",
   "cs",	"Czech",
   "da", "Danish",
   "de", "German",
-  "dz",	"Dzongkha",
+#  "dz",	"Dzongkha",
   "el", "Greek",
   "es", "Spanish",
   "eu",	"Basque",
-  "fa", "Persian",
+#  "fa", "Persian",
   "fi", "Finnish",
   "fr", "French",
   "ga", "Irish",
-  "gu",	"Gujarati",
+#  "gu",	"Gujarati",
   "he",	"Hebrew",
-  "hi",	"Hindi",
+#  "hi",	"Hindi",
   "hr",	"Croatian",
   "hu",	"Hungarian",
   "id",	"Indonesian",
   "it", "Italian",
   "ja",	"Japanese",
-  "ka", "Georgian",
+#  "ka", "Georgian",
   "ko", "Korean",
   "lt",	"Lithuanian",
   "mk",	"Macedonian",
-  "ml",	"Malayalam",
-  "mr",	"Marathi",
+#  "ml",	"Malayalam",
+#  "mr",	"Marathi",
   "ms",	"Malay",
-  "nb",	"Norwegian Bokmal",
-  "ne",	"Nepal",
+  "nb",	"Norwegian",
+#  "ne",	"Nepal",
   "nl",	"Dutch",
-  "nn",	"Norwegian Nynorsk",
-  "oc",	"Occitan",
-  "pa",	"Punjabi",
+  "nn",	"NorwegianNynorsk",
+#  "oc",	"Occitan",
+#  "pa",	"Punjabi",
   "pl",	"Polish",
   "pt",	"Portuguese",
   "pt_BR", "PortugueseBR",
   "ro",	"Romanian",
   "ru",	"Russian",
-  "rw",	"Kinyarwanda",
+ # "rw",	"Kinyarwanda",
   "sk",	"Slovak",
   "sl",	"Slovenian",
-  "so",	"Somali",
+#  "so",	"Somali",
   "sq",	"Albanian",
   "sr",	"Serbian",
   "sv",	"Swedish",
-  "ta",	"Tamil",
+#  "ta",	"Tamil",
   "th",	"Thai",
   "tr",	"Turkish",
   "uk", "Ukrainian",
-  "ur",	"Urdu",
-  "vi",	"Vietnamese",
-  "wa",	"Walloon",
+#  "ur",	"Urdu",
+#  "vi",	"Vietnamese",
+#  "wa",	"Walloon",
   "zh",	"SimpChinese",
   "zh", "TradChinese"
 );