From 33a9fb9f4b577f8417a51379ead9008763325107 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Thu, 28 Jun 2018 15:37:00 +0200
Subject: i18n examples: Update .ts files

Change-Id: I3c1987bac8251b087fab98d6caaaba267dcc4be8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 examples/quick/demos/photoviewer/i18n/qml_de.ts | 10 +++++-----
 examples/quick/demos/photoviewer/i18n/qml_fr.ts | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'examples/quick')

diff --git a/examples/quick/demos/photoviewer/i18n/qml_de.ts b/examples/quick/demos/photoviewer/i18n/qml_de.ts
index 92ab50a136..c36f169c6a 100644
--- a/examples/quick/demos/photoviewer/i18n/qml_de.ts
+++ b/examples/quick/demos/photoviewer/i18n/qml_de.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AlbumDelegate</name>
     <message>
-        <location filename="../PhotoViewerCore/AlbumDelegate.qml" line="102"/>
+        <location filename="../PhotoViewerCore/AlbumDelegate.qml" line="111"/>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
@@ -12,22 +12,22 @@
 <context>
     <name>main</name>
     <message>
-        <location filename="../main.qml" line="75"/>
+        <location filename="../main.qml" line="93"/>
         <source>Add</source>
         <translation>Zufügen</translation>
     </message>
     <message>
-        <location filename="../main.qml" line="84"/>
+        <location filename="../main.qml" line="102"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="../main.qml" line="89"/>
+        <location filename="../main.qml" line="107"/>
         <source>Quit</source>
         <translation>Verlassen</translation>
     </message>
     <message>
-        <location filename="../main.qml" line="102"/>
+        <location filename="../main.qml" line="122"/>
         <source>Back</source>
         <translation>Zurück</translation>
     </message>
diff --git a/examples/quick/demos/photoviewer/i18n/qml_fr.ts b/examples/quick/demos/photoviewer/i18n/qml_fr.ts
index 1edb5e0fe4..353082569a 100644
--- a/examples/quick/demos/photoviewer/i18n/qml_fr.ts
+++ b/examples/quick/demos/photoviewer/i18n/qml_fr.ts
@@ -4,7 +4,7 @@
 <context>
     <name>AlbumDelegate</name>
     <message>
-        <location filename="../PhotoViewerCore/AlbumDelegate.qml" line="102"/>
+        <location filename="../PhotoViewerCore/AlbumDelegate.qml" line="111"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
@@ -12,22 +12,22 @@
 <context>
     <name>main</name>
     <message>
-        <location filename="../main.qml" line="75"/>
+        <location filename="../main.qml" line="93"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="../main.qml" line="84"/>
+        <location filename="../main.qml" line="102"/>
         <source>Edit</source>
         <translation>Éditer</translation>
     </message>
     <message>
-        <location filename="../main.qml" line="89"/>
+        <location filename="../main.qml" line="107"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.qml" line="102"/>
+        <location filename="../main.qml" line="122"/>
         <source>Back</source>
         <translation>Retour</translation>
     </message>
-- 
cgit v1.2.3


From 369998639b37b5de46ab1b19b3dd6ca6c2b77d34 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Thu, 28 Jun 2018 15:38:01 +0200
Subject: i18n examples: Add en translation dummies

We endorse using QTranslator::install(const QLocale&...), because
it tries loading translations from all QLocale::uiLanguages() instead
of the commonly used QLocale::system().name() setup.

Anyhow, the first method requires an English translation - otherwise
a second favorite language might be used.

Pave the way to making the switch by adding (empty) English translations
to our examples.

Task-number: QTBUG-69196
Change-Id: Ie85be875e34e29e80c1693bbf477b962e35a7d87
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
 examples/quick/demos/photoviewer/i18n/qml_en.qm  | Bin 0 -> 23 bytes
 examples/quick/demos/photoviewer/i18n/qml_en.ts  |   4 ++++
 examples/quick/demos/photoviewer/photoviewer.pro |   3 ++-
 examples/quick/demos/photoviewer/qml.qrc         |   1 +
 4 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 examples/quick/demos/photoviewer/i18n/qml_en.qm
 create mode 100644 examples/quick/demos/photoviewer/i18n/qml_en.ts

(limited to 'examples/quick')

diff --git a/examples/quick/demos/photoviewer/i18n/qml_en.qm b/examples/quick/demos/photoviewer/i18n/qml_en.qm
new file mode 100644
index 0000000000..9dad8dffce
Binary files /dev/null and b/examples/quick/demos/photoviewer/i18n/qml_en.qm differ
diff --git a/examples/quick/demos/photoviewer/i18n/qml_en.ts b/examples/quick/demos/photoviewer/i18n/qml_en.ts
new file mode 100644
index 0000000000..5315a75526
--- /dev/null
+++ b/examples/quick/demos/photoviewer/i18n/qml_en.ts
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en">
+</TS>
diff --git a/examples/quick/demos/photoviewer/photoviewer.pro b/examples/quick/demos/photoviewer/photoviewer.pro
index 68e43e13f9..885b81b4ad 100644
--- a/examples/quick/demos/photoviewer/photoviewer.pro
+++ b/examples/quick/demos/photoviewer/photoviewer.pro
@@ -10,7 +10,8 @@ SOURCES = *.qml \
           PhotoViewerCore/script/*.js
 }
 
-TRANSLATIONS += i18n/qml_fr.ts \
+TRANSLATIONS += i18n/qml_en.ts \
+                i18n/qml_fr.ts \
                 i18n/qml_de.ts
 
 RESOURCES += qml.qrc
diff --git a/examples/quick/demos/photoviewer/qml.qrc b/examples/quick/demos/photoviewer/qml.qrc
index 8abefc6212..49f0b27e50 100644
--- a/examples/quick/demos/photoviewer/qml.qrc
+++ b/examples/quick/demos/photoviewer/qml.qrc
@@ -15,5 +15,6 @@
         <file>PhotoViewerCore/script/script.js</file>
         <file>i18n/qml_fr.qm</file>
         <file>i18n/qml_de.qm</file>
+        <file>i18n/qml_en.qm</file>
     </qresource>
 </RCC>
-- 
cgit v1.2.3