[gcompris] Minor simplification. There is only a single @INSERT_TRANSLATIONS@
- From: Bruno Coudoin <bcoudoin src gnome org>
- To: svn-commits-list gnome org
- Subject: [gcompris] Minor simplification. There is only a single @INSERT_TRANSLATIONS@
- Date: Wed, 22 Jul 2009 23:08:18 +0000 (UTC)
commit ff503787406f1601a29b67bc8add06935f119e7c
Author: Bruno Coudoin <bruno coudoin free fr>
Date: Thu Jul 23 01:06:17 2009 +0200
Minor simplification. There is only a single @INSERT_TRANSLATIONS@
to add in the installer file.
gcompris-installer.nsi.in | 4 +---
tools/create_nsis_translations.pl | 9 +++------
2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/gcompris-installer.nsi.in b/gcompris-installer.nsi.in
index 8840b94..9a50df7 100644
--- a/gcompris-installer.nsi.in
+++ b/gcompris-installer.nsi.in
@@ -90,9 +90,7 @@ SetDateSave on
;--------------------------------
;Languages
- @INSERTMACRO_MUI_LANGUAGE@
-
- @GCOMPRIS_MACRO_INCLUDE_LANGFILE@
+ @INSERT_TRANSLATIONS@
;--------------------------------
;Reserve Files
diff --git a/tools/create_nsis_translations.pl b/tools/create_nsis_translations.pl
index 24c6a15..119bfe8 100755
--- a/tools/create_nsis_translations.pl
+++ b/tools/create_nsis_translations.pl
@@ -170,6 +170,7 @@ $gcomprisLanguages .= '
my $text_en = $result{"en"};
foreach my $keyEn (keys(%$text_en)) {
$gcomprisLanguages .= " !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT $keyEn \${CUR_LANG}";
+ $gcomprisLanguages .= "\n";
}
$gcomprisLanguages .= '
@@ -195,14 +196,10 @@ foreach my $lang (@localeKeys) {
my $gcomprisInstaller;
open (MYFILE, 'gcompris-installer.nsi');
while (<MYFILE>) {
- if ($_ =~ /\ INSERTMACRO_MUI_LANGUAGE\@/)
+ if ($_ =~ /\ INSERT_TRANSLATIONS\@/)
{
- print "Processing \ INSERTMACRO_MUI_LANGUAGE\@\n";
+ print "Processing \ INSERT_TRANSLATIONS\@\n";
$gcomprisInstaller .= $muiLanguages;
- }
- elsif ($_ =~ /\ GCOMPRIS_MACRO_INCLUDE_LANGFILE\@/)
- {
- print "Processing \ GCOMPRIS_MACRO_INCLUDE_LANGFILE\@\n";
$gcomprisInstaller .= $gcomprisLanguages;
}
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]