Merge pull request #926 from ahuarte47/Issue_8769

Fix #8769 - Missing flags for 3 locales
qgis · Oct 11, 2013 · f4e0c83 · f4e0c83
2 parents 572bda8 + 860a238
commit f4e0c83
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/images/flags/sr.png → images/flags/sr_Cyrl.png b/images/flags/sr.png → images/flags/sr_Cyrl.png
diff --git a/images/flags/sr_Latn.png b/images/flags/sr_Latn.png
diff --git a/images/images.qrc b/images/images.qrc
@@ -39,7 +39,8 @@
         <file>flags/sk.png</file>
         <file>flags/sl_SI.png</file>
         <file>flags/sq_AL.png</file>
-        <file>flags/sr.png</file>
+        <file>flags/sr_Cyrl.png</file>
+        <file>flags/sr_Latn.png</file>
         <file>flags/sv.png</file>
         <file>flags/sw.png</file>
         <file>flags/ta.png</file>

diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -1341,6 +1341,10 @@ QStringList QgsOptions::i18nList()
   while ( myIterator.hasNext() )
   {
     QString myFileName = myIterator.next();
+
+	// Ignore the 'en' translation file, already added as 'en_US'.
+	if (myFileName.compare( "qgis_en.qm" )==0) continue;
+
     myList << myFileName.replace( "qgis_", "" ).replace( ".qm", "" );
   }
   return myList;