Skip to content

Commit 860a238

Browse files
committed
Fix #8769 - Missing flags for 3 locales
Fixed the images related to servian translations, ignore the 'en' translation (overrided for 'en_US') in the load of the QsgOptions dialog.
1 parent cecfff0 commit 860a238

File tree

4 files changed

+6
-1
lines changed

4 files changed

+6
-1
lines changed
File renamed without changes.

images/flags/sr_Latn.png

423 Bytes
Loading

images/images.qrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
<file>flags/sk.png</file>
4040
<file>flags/sl_SI.png</file>
4141
<file>flags/sq_AL.png</file>
42-
<file>flags/sr.png</file>
42+
<file>flags/sr_Cyrl.png</file>
43+
<file>flags/sr_Latn.png</file>
4344
<file>flags/sv.png</file>
4445
<file>flags/sw.png</file>
4546
<file>flags/ta.png</file>

src/app/qgsoptions.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -1341,6 +1341,10 @@ QStringList QgsOptions::i18nList()
13411341
while ( myIterator.hasNext() )
13421342
{
13431343
QString myFileName = myIterator.next();
1344+
1345+
// Ignore the 'en' translation file, already added as 'en_US'.
1346+
if (myFileName.compare( "qgis_en.qm" )==0) continue;
1347+
13441348
myList << myFileName.replace( "qgis_", "" ).replace( ".qm", "" );
13451349
}
13461350
return myList;

0 commit comments

Comments
 (0)