From 8056e718ee475f04589a112ccfab2dee70741ac9 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 30 Jun 2018 12:23:06 +0200
Subject: [PATCH] See #161: ensure we have proper paths in po files

---
 front/locales/app.pot                  | 30 ++++++++++--------
 front/locales/en_US/LC_MESSAGES/app.po | 30 ++++++++++--------
 front/locales/fr_FR/LC_MESSAGES/app.po | 43 ++++++++++++--------------
 front/scripts/i18n-extract.sh          |  3 ++
 4 files changed, 57 insertions(+), 49 deletions(-)

diff --git a/front/locales/app.pot b/front/locales/app.pot
index 1d6aa575..c24799ac 100644
--- a/front/locales/app.pot
+++ b/front/locales/app.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: front 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-30 11:34+0200\n"
+"POT-Creation-Date: 2018-06-30 12:21+0200\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"
@@ -17,50 +17,54 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/App.vue:51
+#: front/src/App.vue:51
 msgid "About Funkwhale"
 msgstr ""
 
-#: src/App.vue:53
+#: front/src/App.vue:53
 msgid "Funkwhale is a free and open-source project run by volunteers. You can help us improve the platform by reporting bugs, suggesting features and share the project with your friends!"
 msgstr ""
 
-#: src/App.vue:29
+#: front/src/App.vue:29
 msgid "Links"
 msgstr ""
 
-#: src/App.vue:38
+#: front/src/App.vue:60
+msgid "Options"
+msgstr ""
+
+#: front/src/App.vue:38
 msgid "Source code"
 msgstr ""
 
-#: src/App.vue:37
+#: front/src/App.vue:37
 msgid "Source code (%{version})"
 msgstr ""
 
-#: src/App.vue:56
+#: front/src/App.vue:56
 msgid "The funkwhale logo was kindly designed and provided by Francis Gading."
 msgstr ""
 
-#: src/App.vue:118
+#: front/src/App.vue:130
 msgid "This will erase your local data and disconnect you, do you want to continue?"
 msgstr ""
 
-#: src/App.vue:5
+#: front/src/App.vue:5
 msgid "Choose your instance"
 msgstr ""
 
-#: src/App.vue:7
+#: front/src/App.vue:7
 msgid "You need to select an instance in order to continue"
 msgstr ""
 
-#: src/App.vue:33
+#: front/src/App.vue:33
 msgid "About this instance"
 msgstr ""
 
-#: src/App.vue:36
+#: front/src/App.vue:36
 msgid "Documentation"
 msgstr ""
 
-#: src/App.vue:43
+#: front/src/App.vue:43
 msgid "Use another instance"
 msgstr ""
diff --git a/front/locales/en_US/LC_MESSAGES/app.po b/front/locales/en_US/LC_MESSAGES/app.po
index 20d2591f..377ffe26 100644
--- a/front/locales/en_US/LC_MESSAGES/app.po
+++ b/front/locales/en_US/LC_MESSAGES/app.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: front 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-30 11:34+0200\n"
+"POT-Creation-Date: 2018-06-30 12:21+0200\n"
 "PO-Revision-Date: 2018-06-30 11:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,50 +17,54 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/App.vue:51
+#: front/src/App.vue:51
 msgid "About Funkwhale"
 msgstr "About Funkwhale"
 
-#: src/App.vue:53
+#: front/src/App.vue:53
 msgid "Funkwhale is a free and open-source project run by volunteers. You can help us improve the platform by reporting bugs, suggesting features and share the project with your friends!"
 msgstr "Funkwhale is a free and open-source project run by volunteers. You can help us improve the platform by reporting bugs, suggesting features and share the project with your friends!"
 
-#: src/App.vue:29
+#: front/src/App.vue:29
 msgid "Links"
 msgstr "Links"
 
-#: src/App.vue:38
+#: front/src/App.vue:60
+msgid "Options"
+msgstr ""
+
+#: front/src/App.vue:38
 msgid "Source code"
 msgstr "Source code"
 
-#: src/App.vue:37
+#: front/src/App.vue:37
 msgid "Source code (%{version})"
 msgstr "Source code (%{version})"
 
-#: src/App.vue:56
+#: front/src/App.vue:56
 msgid "The funkwhale logo was kindly designed and provided by Francis Gading."
 msgstr "The funkwhale logo was kindly designed and provided by Francis Gading."
 
-#: src/App.vue:118
+#: front/src/App.vue:130
 msgid "This will erase your local data and disconnect you, do you want to continue?"
 msgstr "This will erase your local data and disconnect you, do you want to continue?"
 
-#: src/App.vue:5
+#: front/src/App.vue:5
 msgid "Choose your instance"
 msgstr "Choose your instance"
 
-#: src/App.vue:7
+#: front/src/App.vue:7
 msgid "You need to select an instance in order to continue"
 msgstr "You need to select an instance in order to continue"
 
-#: src/App.vue:33
+#: front/src/App.vue:33
 msgid "About this instance"
 msgstr "About this instance"
 
-#: src/App.vue:36
+#: front/src/App.vue:36
 msgid "Documentation"
 msgstr "Documentation"
 
-#: src/App.vue:43
+#: front/src/App.vue:43
 msgid "Use another instance"
 msgstr "Use another instance"
diff --git a/front/locales/fr_FR/LC_MESSAGES/app.po b/front/locales/fr_FR/LC_MESSAGES/app.po
index bd211205..4cba6e50 100644
--- a/front/locales/fr_FR/LC_MESSAGES/app.po
+++ b/front/locales/fr_FR/LC_MESSAGES/app.po
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: front 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-30 11:34+0200\n"
+"POT-Creation-Date: 2018-06-30 12:21+0200\n"
 "PO-Revision-Date: 2018-06-30 09:41+0000\n"
 "Last-Translator: Eliot Berriot <contact@eliotberriot.com>\n"
-"Language-Team: French <https://translate.funkwhale.audio/projects/funkwhale/"
-"front/fr/>\n"
+"Language-Team: French <https://translate.funkwhale.audio/projects/funkwhale/front/fr/>\n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,56 +18,54 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 2.20\n"
 
-#: src/App.vue:51
+#: front/src/App.vue:51
 msgid "About Funkwhale"
 msgstr "À propos de Funkwhale"
 
-#: src/App.vue:53
+#: front/src/App.vue:53
 msgid "Funkwhale is a free and open-source project run by volunteers. You can help us improve the platform by reporting bugs, suggesting features and share the project with your friends!"
-msgstr ""
-"Funkwhale est un projet libre, gratuit et open-source maintenu par des "
-"bénévoles. Vous pouvez nous aider à l'améliorer en nous remontant les bugs "
-"éventuels, en nous suggérant des améliorations et en en parlant autour de "
-"vous !"
+msgstr "Funkwhale est un projet libre, gratuit et open-source maintenu par des bénévoles. Vous pouvez nous aider à l'améliorer en nous remontant les bugs éventuels, en nous suggérant des améliorations et en en parlant autour de vous !"
 
-#: src/App.vue:29
+#: front/src/App.vue:29
 msgid "Links"
 msgstr "Liens"
 
-#: src/App.vue:38
+#: front/src/App.vue:60
+msgid "Options"
+msgstr ""
+
+#: front/src/App.vue:38
 msgid "Source code"
 msgstr "Code source"
 
-#: src/App.vue:37
+#: front/src/App.vue:37
 msgid "Source code (%{version})"
 msgstr "Code source (version %{version})"
 
-#: src/App.vue:56
+#: front/src/App.vue:56
 msgid "The funkwhale logo was kindly designed and provided by Francis Gading."
 msgstr "Le logo Funkwhale est une création de Francis Gading."
 
-#: src/App.vue:118
+#: front/src/App.vue:130
 msgid "This will erase your local data and disconnect you, do you want to continue?"
-msgstr ""
-"Cette opération supprimera vos données locales et vous déconnectera, voulez-"
-"vous continuer ?"
+msgstr "Cette opération supprimera vos données locales et vous déconnectera, voulez-vous continuer ?"
 
-#: src/App.vue:5
+#: front/src/App.vue:5
 msgid "Choose your instance"
 msgstr "Choisissez votre instance"
 
-#: src/App.vue:7
+#: front/src/App.vue:7
 msgid "You need to select an instance in order to continue"
 msgstr "Vous devez choisir une instance pour continuer"
 
-#: src/App.vue:33
+#: front/src/App.vue:33
 msgid "About this instance"
 msgstr "À propos de cette instance"
 
-#: src/App.vue:36
+#: front/src/App.vue:36
 msgid "Documentation"
 msgstr "Documentation"
 
-#: src/App.vue:43
+#: front/src/App.vue:43
 msgid "Use another instance"
 msgstr "Se connecter sur une autre instance"
diff --git a/front/scripts/i18n-extract.sh b/front/scripts/i18n-extract.sh
index e8994f86..d4fea4b6 100755
--- a/front/scripts/i18n-extract.sh
+++ b/front/scripts/i18n-extract.sh
@@ -14,6 +14,9 @@ xgettext --language=JavaScript --keyword=npgettext:1c,2,3 \
     --package-version=$(node -e "console.log(require('./package.json').version);") \
     --output $locales_dir/app.pot $js_sources
 
+# Fix broken files path/lines in pot
+sed -e 's|#: src/|#: front/src/|' -i $locales_dir/app.pot
+
 # Generate .po files for each available language.
 echo $locales
 for lang in $locales; do \
-- 
GitLab