Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
set cLocale even for en
authornemo
Tue, 05 Apr 2011 16:27:58 -0400
changeset 5110 d48230ef9447
parent 5107 d7fc678d78f4
child 5111 d8856d98ce7d
set cLocale even for en
hedgewars/hwengine.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/hwengine.pas	Tue Apr 05 16:23:52 2011 -0400
+++ b/hedgewars/hwengine.pas	Tue Apr 05 16:27:58 2011 -0400
@@ -264,13 +264,13 @@
     InitKbdKeyTable();
 
     LoadLocale(Pathz[ptLocale] + '/en.txt');  // Do an initial load with english
+    if (Length(cLocaleFName) > 6) then cLocale := Copy(cLocaleFName,1,5)
+    else cLocale := Copy(cLocaleFName,1,2);
     if cLocaleFName <> 'en.txt' then
         begin
-        if (Length(cLocaleFName) > 6) then cLocale := Copy(cLocaleFName,1,5)
-        else cLocale := Copy(cLocaleFName,1,2);
         // Try two letter locale first before trying specific locale overrides
-        if (Length(cLocaleFName) > 6) and (Copy(cLocaleFName,1,2)+'.txt' <> 'en.txt') then
-            LoadLocale(Pathz[ptLocale] + '/' + Copy(cLocaleFName,1,2)+'.txt');
+        if (Length(cLocale) > 2) and (Copy(cLocale,1,2) <> 'en') then
+            LoadLocale(Pathz[ptLocale] + '/' + Copy(cLocale,1,2)+'.txt');
         LoadLocale(Pathz[ptLocale] + '/' + cLocaleFName);
         end
     else cLocale := 'en';
hedgewars