From 7d1064105959a7f8b02402742fc4735b9ff27b6a Mon Sep 17 00:00:00 2001
From: Bruno Coudoin <bruno.coudoin@free.fr>
Date: Sun, 19 Jul 2009 23:32:48 +0000
Subject: In progress, the windows installer with po translation does not work yet.

---
(limited to 'nsis')

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."
--
cgit v0.9.1