From 8e6db8859c756ef2445e1f5277103d83c735c726 Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Wed, 9 Oct 2019 23:32:03 +0200
Subject: Plugins: Set UI texts in code instead of .ui files to fix
 translations

Co-authored-by: srgcdev <srg.dev@posteo.net>
---
 plugins/omemo/data/contact_details_dialog.ui | 14 ++++----------
 plugins/omemo/data/manage_key_dialog.ui      | 12 +++---------
 2 files changed, 7 insertions(+), 19 deletions(-)

(limited to 'plugins/omemo/data')

diff --git a/plugins/omemo/data/contact_details_dialog.ui b/plugins/omemo/data/contact_details_dialog.ui
index 1f3e9afa..50e19eee 100644
--- a/plugins/omemo/data/contact_details_dialog.ui
+++ b/plugins/omemo/data/contact_details_dialog.ui
@@ -2,7 +2,6 @@
 <interface>
     <template class="DinoPluginsOmemoContactDetailsDialog">
         <property name="modal">True</property>
-        <property name="title" translatable="yes">OMEMO Key Management</property>
         <property name="resizable">False</property>
         <child internal-child="vbox">
             <object class="GtkBox">
@@ -35,10 +34,9 @@
                                                         <property name="orientation">vertical</property>
                                                         <property name="hexpand">True</property>
                                                         <child>
-                                                            <object class="GtkLabel">
+                                                            <object class="GtkLabel" id="automatically_accept_new_label">
                                                                 <property name="visible">True</property>
                                                                 <property name="halign">start</property>
-                                                                <property name="label" translatable="yes">Automatically accept new keys</property>
                                                                 <attributes>
                                                                     <attribute name="scale" value="1.1"/>
                                                                 </attributes>
@@ -51,7 +49,6 @@
                                                                 <property name="expand">True</property>
                                                                 <property name="xalign">0</property>
                                                                 <property name="wrap">True</property>
-                                                                <property name="label" translatable="yes">When this contact adds new encryption keys to their account, automatically accept them.</property>
                                                                 <attributes>
                                                                     <attribute name="scale" value="0.8"/>
                                                                 </attributes>
@@ -83,10 +80,9 @@
                         <property name="orientation">vertical</property>
                         <property name="spacing">2</property>
                         <child>
-                            <object class="GtkLabel">
+                            <object class="GtkLabel" id="own_key_label">
                                 <property name="visible">True</property>
                                 <property name="halign">start</property>
-                                <property name="label" translatable="yes">Own key</property>
                                 <attributes>
                                     <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
                                 </attributes>
@@ -174,10 +170,9 @@
                         <property name="orientation">vertical</property>
                         <property name="spacing">2</property>
                         <child>
-                            <object class="GtkLabel">
+                            <object class="GtkLabel" id="new_keys_label">
                                 <property name="visible">True</property>
                                 <property name="halign">start</property>
-                                <property name="label" translatable="yes">New keys</property>
                                 <attributes>
                                     <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
                                 </attributes>
@@ -210,10 +205,9 @@
                         <property name="orientation">vertical</property>
                         <property name="spacing">2</property>
                         <child>
-                            <object class="GtkLabel">
+                            <object class="GtkLabel" id="associated_keys_label">
                                 <property name="visible">True</property>
                                 <property name="halign">start</property>
-                                <property name="label" translatable="yes">Associated keys</property>
                                 <attributes>
                                     <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
                                 </attributes>
diff --git a/plugins/omemo/data/manage_key_dialog.ui b/plugins/omemo/data/manage_key_dialog.ui
index 7c739967..dcec4c90 100644
--- a/plugins/omemo/data/manage_key_dialog.ui
+++ b/plugins/omemo/data/manage_key_dialog.ui
@@ -4,13 +4,11 @@
         <property name="modal">True</property>
         <property name="resizable">False</property>
         <child type="titlebar">
-            <object class="GtkHeaderBar" id="header_bar">
+            <object class="GtkHeaderBar" id="headerbar">
                 <property name="visible">True</property>
-                <property name="title" translatable="yes">Manage Key</property>
                 <property name="show_close_button">False</property>
                 <child>
                     <object class="GtkButton" id="cancel_button">
-                        <property name="label" translatable="yes">Cancel</property>
                         <property name="sensitive">True</property>
                         <property name="visible">True</property>
                     </object>
@@ -22,7 +20,6 @@
                     <object class="GtkButton" id="ok_button">
                         <property name="has_default">True</property>
                         <property name="can_default">True</property>
-                        <property name="label" translatable="yes">Confirm</property>
                         <property name="sensitive">False</property>
                         <property name="visible">True</property>
                         <style>
@@ -81,11 +78,10 @@
                                 <property name="orientation">vertical</property>
                                 <property name="valign">center</property>
                                 <child>
-                                    <object class="GtkLabel">
+                                    <object class="GtkLabel" id="compare_fingerprint_label">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">Compare the fingerprint, character by character, with the one shown on your contacts device.</property>
                                         <property name="wrap">True</property>
-                                        <property name="xalign">0</property>
+                                        <property name="xalign">0.5</property>
                                         <property name="max-width-chars">45</property>
                                     </object>
                                 </child>
@@ -110,14 +106,12 @@
                                             <object class="GtkButton" id="verify_no_button">
                                                 <property name="visible">True</property>
                                                 <property name="hexpand">True</property>
-                                                <property name="label" translatable="yes">Not matching</property>
                                             </object>
                                         </child>
                                         <child>
                                             <object class="GtkButton" id="verify_yes_button">
                                                 <property name="visible">True</property>
                                                 <property name="hexpand">True</property>
-                                                <property name="label" translatable="yes">Matching</property>
                                             </object>
                                         </child>
                                     </object>
-- 
cgit v1.2.3-54-g00ecf