summaryrefslogtreecommitdiff
path: root/scp2/macros
diff options
context:
space:
mode:
authorskotti <skotti@wintermute>2009-10-27 14:57:42 +0100
committerskotti <skotti@wintermute>2009-10-27 14:57:42 +0100
commit724ca7d750a57165a5eaa02f6b623da3f3eb3909 (patch)
tree0018cad79f5cb35186f40453f3e630849815a322 /scp2/macros
parent3ea95386a5fdaedaa733db4c979c8096c8ec0148 (diff)
parent5481010878bb849ea28ede741bfc39bdc21ca0ec (diff)
Merge latest DEV300 and CWS sb111
Diffstat (limited to 'scp2/macros')
-rw-r--r--scp2/macros/macro.pl20
1 files changed, 18 insertions, 2 deletions
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 53bf047d9e98..91089c901cef 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -64,6 +64,7 @@ write_DIR_ISOLANGUAGE_ALL_LANG();
write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ();
write_DIR_IDENT_ALL_LANG();
write_EXTRA_ALL_LANG();
+write_EXTRA_ALL_LANG_BUT_EN_US();
write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG();
write_EXTRA_IDENT_ALL_LANG();
write_RESFILE_ALL_LANG();
@@ -138,14 +139,29 @@ sub write_DIR_IDENT_ALL_LANG
sub write_EXTRA_ALL_LANG
{
- print OUTFILE "#define EXTRA_ALL_LANG(name) ";
+ print OUTFILE "#define EXTRA_ALL_LANG(name,ext) ";
foreach $lang (@completelangiso) {
- print OUTFILE "\\\n\tName ($lang) = EXTRAFILENAME(name,_$lang)";
+ print OUTFILE "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)";
print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
}
print OUTFILE "\n\n";
}
+sub write_EXTRA_ALL_LANG_BUT_EN_US
+{
+ print OUTFILE "#define EXTRA_ALL_LANG_BUT_EN_US(name,ext) ";
+ my $first = 1;
+ foreach $lang (@completelangiso) {
+ if ($lang ne "en-US") {
+ print OUTFILE "; " unless $first;
+ $first = 0;
+ print OUTFILE
+ "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)";
+ }
+ }
+ print OUTFILE "\n\n";
+}
+
sub write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG
{
my $first = 1;