From 8a30cc20a16d669bbb0dac4cfc628a845a7cb0ba Mon Sep 17 00:00:00 2001
From: erinn <erinn@openprivacy.ca>
Date: Mon, 25 Mar 2019 13:21:32 -0700
Subject: [PATCH] add fr to language switcher

---
 i18n/translation_fr.ts     |  2 +-
 qml.qrc                    |  3 ++-
 qml/panes/SettingsPane.qml | 35 +++++++++++++++++++++++------------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/i18n/translation_fr.ts b/i18n/translation_fr.ts
index 1fbdbcaf..cbdefdf0 100644
--- a/i18n/translation_fr.ts
+++ b/i18n/translation_fr.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="en_US">
+<TS version="2.1" language="fr_FR">
 <context>
     <name>AddGroupPane</name>
     <message>
diff --git a/qml.qrc b/qml.qrc
index 580f16f0..99f13d05 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -30,8 +30,9 @@
         <file>qml/widgets/controls/Loader.qml</file>
         <file>qml/widgets/controls/Text.qml</file>
         <file>qml/widgets/controls/Variables.qml</file>
-        <file>i18n/translation_en.qm</file>
         <file>i18n/translation_de.qm</file>
+        <file>i18n/translation_en.qm</file>
+        <file>i18n/translation_fr.qm</file>
         <file>i18n/translation_pt.qm</file>
     </qresource>
 </RCC>
diff --git a/qml/panes/SettingsPane.qml b/qml/panes/SettingsPane.qml
index f3a3b988..3278e5df 100644
--- a/qml/panes/SettingsPane.qml
+++ b/qml/panes/SettingsPane.qml
@@ -57,20 +57,31 @@ ColumnLayout { // settingsPane
 		size: 8
 	}
 
-	FlagButton {
-	    emoji: "1f1e8-1f1e6"
-	    locale: "en"
-	}
+    GridLayout {
+        columns: 2
+        columnSpacing: 10
 
-	FlagButton {
-    	emoji: "1f1e9-1f1ea"
-    	locale: "de"
-    }
 
-	FlagButton {
-	    locale: "pt"
-    	emoji: "1f1e7-1f1f7"
-    	selected: true
+        FlagButton {
+            emoji: "1f1e9-1f1ea"
+            locale: "de"
+        }
+
+        FlagButton {
+            emoji: "1f1e8-1f1e6"
+            locale: "en"
+            selected: true
+        }
+
+        FlagButton {
+            locale: "fr"
+            emoji: "1f1eb-1f1f7"
+        }
+
+        FlagButton {
+            locale: "pt"
+            emoji: "1f1e7-1f1f7"
+        }
     }
 
     }//end of column with padding