pidgin: 08766d9b: Further updates to the create_nsis_trans...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 08766d9b997786acf12cc9335f8a119fe1004761
Ancestor: 7fe0e39bf57907d9fec1620a52a13db566eb464d
Author: datallah at pidgin.im
Date: 2010-05-18T19:12:37
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/08766d9b997786acf12cc9335f8a119fe1004761

Modified files:
        pidgin/win32/nsis/create_nsis_translations.pl

ChangeLog: 

Further updates to the create_nsis_translations.pl script.
 * Don't include the English key in the translation file when there is no
   native match.  This allows the fallback stuff to work as intended.
 * Fix iconv syntax to something my iconv supports (-o doesn't work on cygwin)
 * Fix the Korean encoding to be something that my iconv matches
 * Fix an incorrectly escaped '@' in "sr at latin"
 * Typo fixes in the GCOMPRIS_MACRO_DEFAULT_STRING warning message
 
It is interesting that this stuff is coming full-circle, the gcompis script
was originally based on our script. :)

-------------- next part --------------
============================================================
--- pidgin/win32/nsis/create_nsis_translations.pl	84e0d14bec8ab461c1b67ce69ca6f5fd13bdc074
+++ pidgin/win32/nsis/create_nsis_translations.pl	19b565f60586a107353ecfee3bce5d093cf2c9fb
@@ -115,7 +115,7 @@ my %localeNames = (
   "it" =>	["Italian", "WINDOWS-1252"],
   "ja" =>	["Japanese", "CP932"],
 #  "ka" =>	["Georgian", "UTF-8"],
-  "ko" =>	["Korean", "MSCP949"],
+  "ko" =>	["Korean", "CP949"],
   "ku" =>	["Kurdish", "WINDOWS-1254"],
   "lt" =>	["Lithuanian", "WINDOWS-1257"],
   "mk" =>	["Macedonian", "WINDOWS-1251"],
@@ -139,7 +139,7 @@ my %localeNames = (
 #  "so" =>	["Somali", "UTF-8"],
   "sq" =>	["Albanian", "WINDOWS-1252"],
   "sr" =>	["Serbian", "WINDOWS-1251"],
-  "sr at latin" =>	["SerbianLatin", "WINDOWS-1250"],
+  "sr\@latin" =>	["SerbianLatin", "WINDOWS-1250"],
   "sv" =>	["Swedish", "WINDOWS-1252"],
 #  "ta" =>	["Tamil", "UTF-8"],
   "th" =>	["Thai", "WINDOWS-874"],
@@ -219,7 +219,7 @@ $gcomprisLanguages .= '
   !ifndef "${LABEL}"
     !define "${LABEL}" "${VALUE}"
     !ifdef INSERT_DEFAULT
-      !warning "${LANG} lang file mising ${LABEL}, using default.."
+      !warning "${LANG} lang file missing ${LABEL}, using default..."
     !endif
   !endif
 !macroend
@@ -332,18 +332,18 @@ foreach my $lang (@localeKeys) {
 	}
 	# English keys are the reference.
 	# If not found they are inserted
-	if ( ! $found )
-	{
-	    print DESC "$result{'en'}{$keyEn}";
-	}
+	#if ( ! $found )
+	#{
+	#    print DESC "$result{'en'}{$keyEn}";
+	#}
     }
     close DESC;
 
     # iconv conversion
-    system("iconv -f UTF-8 -t $localeNames{$lang}[1] $tmp_dir/$lang.nsh.utf8 -o $tmp_dir/$lang.nsh");
+    system("iconv -f UTF-8 -t $localeNames{$lang}[1] $tmp_dir/$lang.nsh.utf8 > $tmp_dir/$lang.nsh");
     if ($? ne 0)
     {
-	print("ERROR: Failed to run: iconv -f UTF-8 -t $localeNames{$lang}[1] $lang.nsh.utf8 -o $lang.nsh\n");
+	die("ERROR: Failed to run: iconv -f UTF-8 -t $localeNames{$lang}[1] $lang.nsh.utf8 > $lang.nsh\n");
     }
     #`rm $tmp_dir/$lang.nsh.utf8`;