Fixed related to the management of the default english.

2 files changed, 18 insertions, 13 deletions

diff --git a/gcompris-installer.nsi.in b/gcompris-installer.nsi.in
index db5989b..8840b94 100644
--- a/gcompris-installer.nsi.in
+++ b/gcompris-installer.nsi.in
@@ -90,19 +90,8 @@ SetDateSave on
 ;--------------------------------
 ;Languages
 
-  ;; English goes first because its the default. The rest are
-  ;; in alphabetical order (at least the strings actually displayed
-  ;; will be).
-
-  !insertmacro MUI_LANGUAGE "English"
-
   @INSERTMACRO_MUI_LANGUAGE@
 
-;--------------------------------
-;Translations
-
-  !include "${GCOMPRIS_NSIS_INCLUDE_PATH}\langmacros.nsh"
-
   @GCOMPRIS_MACRO_INCLUDE_LANGFILE@
 
 ;--------------------------------
diff --git a/tools/create_nsis_translations.pl b/tools/create_nsis_translations.pl
index f2e8b0a..29a3da6 100755
--- a/tools/create_nsis_translations.pl
+++ b/tools/create_nsis_translations.pl
@@ -23,6 +23,7 @@ my %localeNames = (
   "de", "German",
 #  "dz",	"Dzongkha",
   "el", "Greek",
+  "en", "English",
   "es", "Spanish",
   "eu",	"Basque",
 #  "fa", "Persian",
@@ -82,7 +83,15 @@ my @localeKeys = keys(%localeNames);
 #   !insertmacro MUI_LANGUAGE "French"
 
 my $muiLanguages;
+$muiLanguages = '
+  ;; English goes first because its the default. The rest are
+  ;; in alphabetical order (at least the strings actually displayed
+  ;; will be).
+  !insertmacro MUI_LANGUAGE "English"
+';
+
 foreach my $lang (@localeKeys) {
+    if ( $lang eq "en" ) { next; }
     $muiLanguages .= "  !insertmacro MUI_LANGUAGE \"$localeNames{$lang}\"\n";
 }
 
@@ -92,8 +101,14 @@ foreach my $lang (@localeKeys) {
 # By the list of locales:
 #   !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE "ALBANIAN" "${GCOMPRIS_NSIS_INCLUDE_PATH}\translations\albanian.nsh"
 
-my $gcomprisLanguages = "  !define GCOMPRIS_DEFAULT_LANGFILE" .
-    " \"\${GCOMPRIS_NSIS_INCLUDE_PATH}\\translations\\en.nsh\"\n\n";
+my $gcomprisLanguages;
+
+$gcomprisLanguages .= "
+;--------------------------------
+;Translations
+  !define GCOMPRIS_DEFAULT_LANGFILE \"\${GCOMPRIS_NSIS_INCLUDE_PATH}\\translations\\en.nsh\"
+  !include \"\${GCOMPRIS_NSIS_INCLUDE_PATH}\\langmacros.nsh\"
+";
 
 foreach my $lang (@localeKeys) {
     $gcomprisLanguages .= "  !insertmacro GCOMPRIS_MACRO_INCLUDE_LANGFILE".
@@ -170,6 +185,7 @@ close DESC;
 
 print "Creating the nsh locale files\n";
 foreach my $lang (@localeKeys) {
+    if ( $lang eq "en" ) { next; }
     open (DESC, ">nsis/translations/$lang.nsh");
     print DESC ";; Auto generated file by create_nsis_translations.pl\n";