Merge pull request #128 from kmwallio/beta

Fix loading languages
kmwallio · Mar 20, 2021 · 413cf1e · 413cf1e
2 parents 213f2fa + 645d5c8
commit 413cf1e
Show file tree

Hide file tree

Showing 18 changed files with 126 additions and 35 deletions.
diff --git a/com.github.kmwallio.thiefmd.spec b/com.github.kmwallio.thiefmd.spec
@@ -1,5 +1,5 @@
 Name: com.github.kmwallio.thiefmd
-Version: 0.1.7
+Version: 0.1.8
 Release: 1%{?dist}
 Summary: The markdown editor worth stealing.
 License: GPL-3.0+
@@ -324,6 +324,8 @@ rm -vf %{buildroot}%{_libdir}/libultheme.a
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sat Mar 20 2021 kmwallio <mwallio@gmail.com> - 0.1.8
+- Fix translation issues
 * Sun Mar 13 2021 kmwallio <mwallio@gmail.com> - 0.1.7
 - Snap.as image upload support
 - WordPress featured image support

diff --git a/data/com.github.kmwallio.thiefmd.appdata.xml b/data/com.github.kmwallio.thiefmd.appdata.xml
@@ -17,6 +17,7 @@
   <url type="bugtracker">https://github.com/kmwallio/thiefmd/issues</url>
   <url type="help">https://thiefmd.com/deets</url>
   <url type="donation">https://github.com/sponsors/kmwallio</url>
+  <url type="translate">https://poeditor.com/join/project?hash=iQkE5oTIOV</url>
   <content_rating type="oars-1.1">
     <content_attribute id="language-humor">mild</content_attribute>
   </content_rating>
@@ -54,6 +55,15 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release version="0.1.8" date="2021-03-20" urgency="low">
+      <description>
+        <p>Translation loading fixes</p>
+        <ul>
+          <li>New Translations available, hopefully for real this time: French, Slovak, and Swedish</li>
+        </ul>
+      </description>
+      <url>https://github.com/kmwallio/ThiefMD/releases/tag/v0.1.8-languages</url>
+    </release>
     <release version="0.1.7" date="2021-03-13" urgency="low">
       <description>
         <p>The subtle update.</p>

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,17 @@
+com.github.kmwallio.thiefmd (0.1.8) groovy; urgency=low
+
+  * Fix translation issues
+
+ -- kmwallio <mwallio@gmail.com>  Sat, 20 Mar 2021 14:18:31 -0700
+
+com.github.kmwallio.thiefmd (0.1.7) groovy; urgency=low
+
+  * Snap.as image upload support
+  * WordPress featured image support
+  * Performance improvements for experimental mode
+
+ -- kmwallio <mwallio@gmail.com>  Sat, 13 Mar 2021 15:42:28 -0800
+
 com.github.kmwallio.thiefmd (0.1.6) groovy; urgency=low
 
   * Wordpress Export is now available, just add a Connection

diff --git a/flatpak/com.github.kmwallio.thiefmd.json b/flatpak/com.github.kmwallio.thiefmd.json
@@ -33,8 +33,8 @@
             "buildsystem": "meson",
             "sources": [{
                 "type": "archive",
-                "url": "https://download.gnome.org/sources/gtksourceview/4.7/gtksourceview-4.7.90.tar.xz",
-                "sha256": "983bdcb88f98285b3b997c9335057c8fbc45aad0a7c13cb65eb365567e26baaf"
+                "url": "https://download.gnome.org/sources/gtksourceview/4.8/gtksourceview-4.8.1.tar.xz",
+                "sha256": "d163d71b5fcafbc5b1eec6dd841edbdbcddd3a7511cd5fdcffd86b8bbfe69ac1"
             }]
         },
         {
@@ -99,8 +99,8 @@
             "sources" : [
                 {
                     "type": "archive",
-                    "url": "https://download.gnome.org/sources/libhandy/1.0/libhandy-1.0.0.tar.xz",
-                    "sha256": "a9398582f47b7d729205d6eac0c068fef35aaf249fdd57eea3724f8518d26699"
+                    "url": "https://download.gnome.org/sources/libhandy/1.2/libhandy-1.2.0.tar.xz",
+                    "sha256": "39f590ae20910e76fe1c0607b2ebe589750f45610d6aeec5c30e2ee602a20b25"
                 }
             ]
         },

diff --git a/flatpak/shared-modules b/flatpak/shared-modules
diff --git a/meson.build b/meson.build
@@ -1,6 +1,6 @@
 # Name our project
 project('com.github.kmwallio.thiefmd', ['vala', 'c'],
-    version: '0.1.7'
+    version: '0.1.8'
 )
 
 # Application ID
@@ -21,6 +21,10 @@ asresources = gnome.compile_resources(
     c_name: 'as'
 )
 
+# Translations
+gettext_package = meson.project_name()
+podir = meson.source_root() / 'po'
+
 # Set this for convenience
 conf = configuration_data()
 
@@ -34,23 +38,20 @@ conf.set_quoted('PKGDATADIR', pkgdatadir)
 conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 conf.set_quoted('RELEASE_NAME', thief_app_id)
 conf.set_quoted('VERSION', meson.project_version())
+conf.set_quoted('PACKAGE_LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
 add_global_arguments('-DDATADIR="' + get_option('datadir') + '"', language: 'c')
 configure_file(output: 'config.h', configuration: conf)
 config_h_dir = include_directories('.')
 
 # Arguments for C
 c_args = [
   '-include', 'config.h',
+  '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
   '-w'
 ]
 
 cc = meson.get_compiler('c')
 
-# Translations
-gettext_package = meson.project_name()
-localedir = get_option('prefix') / get_option('localedir')
-podir = meson.source_root() / 'po'
-
 # Find libMarkdown
 libmarkdown = dependency('libmarkdown', version: '>= 2.2.1', required: false)
 if libmarkdown.found() == false

diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -15,6 +15,7 @@ src/Controllers/ConnectionManager.vala
 src/Connections/ConnectionBase.vala
 src/Connections/WriteFreelyConnection.vala
 src/Connections/GhostConnection.vala
+src/Connections/WordpressConnection.vala
 src/Exporters/ExportBase.vala
 src/Exporters/ExportDocx.vala
 src/Exporters/ExportEpub.vala
@@ -53,4 +54,5 @@ src/writegood/src/language.vala
 src/writegood/src/writegood.vala
 src/writegood/src/en_us.vala
 src/writeas/src/Writeas.vala
-src/ghost/src/Ghost.vala
+src/ghost/src/Ghost.vala
+src/wordpress/src/Wordpress.vala
diff --git a/po/com.github.kmwallio.thiefmd.pot b/po/com.github.kmwallio.thiefmd.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.kmwallio.thiefmd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-13 13:43-0800\n"
+"POT-Creation-Date: 2021-03-14 07:26-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -82,6 +82,7 @@ msgstr ""
 #: src/Controllers/Dialogs.vala:27 src/Controllers/Dialogs.vala:55
 #: src/Connections/WriteFreelyConnection.vala:129
 #: src/Connections/GhostConnection.vala:111
+#: src/Connections/WordpressConnection.vala:114
 msgid "_Cancel"
 msgstr ""
 
@@ -170,37 +171,44 @@ msgid "Close"
 msgstr ""
 
 #: src/Connections/WriteFreelyConnection.vala:100
+#: src/Connections/WordpressConnection.vala:85
 msgid "Username"
 msgstr ""
 
 #: src/Connections/WriteFreelyConnection.vala:104
 #: src/Connections/GhostConnection.vala:86
+#: src/Connections/WordpressConnection.vala:89
 msgid "Password"
 msgstr ""
 
 #: src/Connections/WriteFreelyConnection.vala:109
 #: src/Connections/GhostConnection.vala:91
+#: src/Connections/WordpressConnection.vala:94
 msgid "Endpoint"
 msgstr ""
 
 #: src/Connections/WriteFreelyConnection.vala:127
 #: src/Connections/GhostConnection.vala:109
+#: src/Connections/WordpressConnection.vala:112
 msgid "_Add Account"
 msgstr ""
 
 #: src/Connections/WriteFreelyConnection.vala:230
 #: src/Connections/GhostConnection.vala:214
+#: src/Connections/WordpressConnection.vala:216
 msgid "Uploading images"
 msgstr ""
 
 #: src/Connections/WriteFreelyConnection.vala:308
-#: src/Connections/GhostConnection.vala:299 src/Widgets/Preferences.vala:83
+#: src/Connections/GhostConnection.vala:299
+#: src/Connections/WordpressConnection.vala:300 src/Widgets/Preferences.vala:83
 #: src/Widgets/Preferences.vala:117 src/Widgets/Preferences.vala:151
 msgid " Published"
 msgstr ""
 
 #: src/Connections/WriteFreelyConnection.vala:308
-#: src/Connections/GhostConnection.vala:299 src/Widgets/Preferences.vala:83
+#: src/Connections/GhostConnection.vala:299
+#: src/Connections/WordpressConnection.vala:300 src/Widgets/Preferences.vala:83
 #: src/Widgets/Preferences.vala:117 src/Widgets/Preferences.vala:151
 msgid "Post Published"
 msgstr ""

diff --git a/po/en_GB.po b/po/en_GB.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ThiefMD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-13 13:43-0800\n"
+"POT-Creation-Date: 2021-03-14 07:26-0700\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,6 +82,7 @@ msgstr "Save"
 #: src/Controllers/Dialogs.vala:27 src/Controllers/Dialogs.vala:55
 #: src/Connections/WriteFreelyConnection.vala:129
 #: src/Connections/GhostConnection.vala:111
+#: src/Connections/WordpressConnection.vala:114
 msgid "_Cancel"
 msgstr "Cancel"
 
@@ -170,37 +171,44 @@ msgid "Close"
 msgstr "Close"
 
 #: src/Connections/WriteFreelyConnection.vala:100
+#: src/Connections/WordpressConnection.vala:85
 msgid "Username"
 msgstr "Username"
 
 #: src/Connections/WriteFreelyConnection.vala:104
 #: src/Connections/GhostConnection.vala:86
+#: src/Connections/WordpressConnection.vala:89
 msgid "Password"
 msgstr "Password"
 
 #: src/Connections/WriteFreelyConnection.vala:109
 #: src/Connections/GhostConnection.vala:91
+#: src/Connections/WordpressConnection.vala:94
 msgid "Endpoint"
 msgstr "Endpoint"
 
 #: src/Connections/WriteFreelyConnection.vala:127
 #: src/Connections/GhostConnection.vala:109
+#: src/Connections/WordpressConnection.vala:112
 msgid "_Add Account"
 msgstr "Add Account"
 
 #: src/Connections/WriteFreelyConnection.vala:230
 #: src/Connections/GhostConnection.vala:214
+#: src/Connections/WordpressConnection.vala:216
 msgid "Uploading images"
 msgstr "Uploading Images"
 
 #: src/Connections/WriteFreelyConnection.vala:308
-#: src/Connections/GhostConnection.vala:299 src/Widgets/Preferences.vala:83
+#: src/Connections/GhostConnection.vala:299
+#: src/Connections/WordpressConnection.vala:300 src/Widgets/Preferences.vala:83
 #: src/Widgets/Preferences.vala:117 src/Widgets/Preferences.vala:151
 msgid " Published"
 msgstr " Published"
 
 #: src/Connections/WriteFreelyConnection.vala:308
-#: src/Connections/GhostConnection.vala:299 src/Widgets/Preferences.vala:83
+#: src/Connections/GhostConnection.vala:299
+#: src/Connections/WordpressConnection.vala:300 src/Widgets/Preferences.vala:83
 #: src/Widgets/Preferences.vala:117 src/Widgets/Preferences.vala:151
 msgid "Post Published"
 msgstr "Post Published"

diff --git a/po/es.po b/po/es.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ThiefMD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-13 13:43-0800\n"
+"POT-Creation-Date: 2021-03-14 07:26-0700\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,6 +74,7 @@ msgstr "_Salvar"
 #: src/Controllers/Dialogs.vala:27 src/Controllers/Dialogs.vala:55
 #: src/Connections/WriteFreelyConnection.vala:129
 #: src/Connections/GhostConnection.vala:111
+#: src/Connections/WordpressConnection.vala:114
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -162,37 +163,44 @@ msgid "Close"
 msgstr "Cerrar"
 
 #: src/Connections/WriteFreelyConnection.vala:100
+#: src/Connections/WordpressConnection.vala:85
 msgid "Username"
 msgstr "Nombre de usuario"
 
 #: src/Connections/WriteFreelyConnection.vala:104
 #: src/Connections/GhostConnection.vala:86
+#: src/Connections/WordpressConnection.vala:89
 msgid "Password"
 msgstr "Contraseña"
 
 #: src/Connections/WriteFreelyConnection.vala:109
 #: src/Connections/GhostConnection.vala:91
+#: src/Connections/WordpressConnection.vala:94
 msgid "Endpoint"
 msgstr "Punto final"
 
 #: src/Connections/WriteFreelyConnection.vala:127
 #: src/Connections/GhostConnection.vala:109
+#: src/Connections/WordpressConnection.vala:112
 msgid "_Add Account"
 msgstr "_Añadir cuenta"
 
 #: src/Connections/WriteFreelyConnection.vala:230
 #: src/Connections/GhostConnection.vala:214
+#: src/Connections/WordpressConnection.vala:216
 msgid "Uploading images"
 msgstr "Subiendo imágenes"
 
 #: src/Connections/WriteFreelyConnection.vala:308
-#: src/Connections/GhostConnection.vala:299 src/Widgets/Preferences.vala:83
+#: src/Connections/GhostConnection.vala:299
+#: src/Connections/WordpressConnection.vala:300 src/Widgets/Preferences.vala:83
 #: src/Widgets/Preferences.vala:117 src/Widgets/Preferences.vala:151
 msgid " Published"
 msgstr " Publicado"
 
 #: src/Connections/WriteFreelyConnection.vala:308
-#: src/Connections/GhostConnection.vala:299 src/Widgets/Preferences.vala:83
+#: src/Connections/GhostConnection.vala:299
+#: src/Connections/WordpressConnection.vala:300 src/Widgets/Preferences.vala:83
 #: src/Widgets/Preferences.vala:117 src/Widgets/Preferences.vala:151
 msgid "Post Published"
 msgstr "Publicación publicada"

diff --git a/po/fr.po b/po/fr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ThiefMD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-13 13:43-0800\n"
+"POT-Creation-Date: 2021-03-14 07:26-0700\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,6 +82,7 @@ msgstr "_Sauvegarder"
 #: src/Controllers/Dialogs.vala:27 src/Controllers/Dialogs.vala:55
 #: src/Connections/WriteFreelyConnection.vala:129
 #: src/Connections/GhostConnection.vala:111
+#: src/Connections/WordpressConnection.vala:114
 msgid "_Cancel"
 msgstr "_Annuler"
 
@@ -173,37 +174,44 @@ msgid "Close"
 msgstr "Fermer"
 
 #: src/Connections/WriteFreelyConnection.vala:100
+#: src/Connections/WordpressConnection.vala:85
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
 #: src/Connections/WriteFreelyConnection.vala:104
 #: src/Connections/GhostConnection.vala:86
+#: src/Connections/WordpressConnection.vala:89
 msgid "Password"
 msgstr "Mot de passe"
 
 #: src/Connections/WriteFreelyConnection.vala:109
 #: src/Connections/GhostConnection.vala:91
+#: src/Connections/WordpressConnection.vala:94
 msgid "Endpoint"
 msgstr "URL"
 
 #: src/Connections/WriteFreelyConnection.vala:127
 #: src/Connections/GhostConnection.vala:109
+#: src/Connections/WordpressConnection.vala:112
 msgid "_Add Account"
 msgstr "A_jouter un compte"
 
 #: src/Connections/WriteFreelyConnection.vala:230
 #: src/Connections/GhostConnection.vala:214
+#: src/Connections/WordpressConnection.vala:216
 msgid "Uploading images"
 msgstr "Chargement des images"
 
 #: src/Connections/WriteFreelyConnection.vala:308
-#: src/Connections/GhostConnection.vala:299 src/Widgets/Preferences.vala:83
+#: src/Connections/GhostConnection.vala:299
+#: src/Connections/WordpressConnection.vala:300 src/Widgets/Preferences.vala:83
 #: src/Widgets/Preferences.vala:117 src/Widgets/Preferences.vala:151
 msgid " Published"
 msgstr " Publié"
 
 #: src/Connections/WriteFreelyConnection.vala:308
-#: src/Connections/GhostConnection.vala:299 src/Widgets/Preferences.vala:83
+#: src/Connections/GhostConnection.vala:299
+#: src/Connections/WordpressConnection.vala:300 src/Widgets/Preferences.vala:83
 #: src/Widgets/Preferences.vala:117 src/Widgets/Preferences.vala:151
 msgid "Post Published"
 msgstr "Article Publié"