Mercurial > gemma

changeset 154:2ba329e82fb0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Wrap vue templates with translation in parentheses An obscure error in vue-gettext corrupted workflow. Using workaround from https://github.com/Polyconseil/vue-gettext/issues/28#issuecomment-367017202 works so far.
author Thomas Junk <thomas.junk@intevation.de>
date Mon, 02 Jul 2018 18:00:18 +0200
parents dc2a5920b731
children 399357bc205e
files client/src/locale/de_DE/LC_MESSAGES/app.po client/src/locale/de_DE/LC_MESSAGES/app.po~ client/src/locale/en_GB/LC_MESSAGES/app.po client/src/locale/en_GB/LC_MESSAGES/app.po~ client/src/locale/it_IT/LC_MESSAGES/app.po client/src/locale/it_IT/LC_MESSAGES/app.po~ client/src/views/Login.vue
diffstat 7 files changed, 66 insertions(+), 59 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/locale/de_DE/LC_MESSAGES/app.po	Mon Jul 02 16:30:29 2018 +0200
+++ b/client/src/locale/de_DE/LC_MESSAGES/app.po	Mon Jul 02 18:00:18 2018 +0200
@@ -1,33 +1,19 @@
-# German translations for wamosjs package
-# German translation for wamosjs.
-# Copyright (C) 2018 THE wamosjs'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the wamosjs package.
-# Automatically generated, 2018.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: wamosjs 0.1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-02 12:51+0200\n"
-"PO-Revision-Date: 2018-06-29 13:23+0200\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de_DE\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
 #: src/views/Login.vue:23
 msgid "Forgot password"
-msgstr "Passwort vergessen?"
+msgstr ""
 
 #: src/views/Login.vue:22
 msgid "Login"
-msgstr "Einloggen"
+msgstr ""
 
 #: src/views/Login.vue:11
 msgid "Login failed"
 msgstr ""
-"Login fehlgeschlagen\n"
-"Bitte versuchen Sie es erneut"
+
+#: src/views/Login.vue:115
+msgid "Enter passphrase"
+msgstr ""
+
+#: src/views/Login.vue:118
+msgid "Enter email"
+msgstr ""
--- a/client/src/locale/de_DE/LC_MESSAGES/app.po~	Mon Jul 02 16:30:29 2018 +0200
+++ b/client/src/locale/de_DE/LC_MESSAGES/app.po~	Mon Jul 02 18:00:18 2018 +0200
@@ -1,27 +0,0 @@
-# German translations for wamosjs package
-# German translation for wamosjs.
-# Copyright (C) 2018 THE wamosjs'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the wamosjs package.
-# Automatically generated, 2018.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: wamosjs 0.1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-29 13:24+0200\n"
-"PO-Revision-Date: 2018-06-29 13:23+0200\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de_DE\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/views/Login.vue:23
-msgid "Forgot password"
-msgstr "Passwort vergessen?"
-
-#: src/views/Login.vue:22
-msgid "Login"
-msgstr "Einloggen"
--- a/client/src/locale/en_GB/LC_MESSAGES/app.po	Mon Jul 02 16:30:29 2018 +0200
+++ b/client/src/locale/en_GB/LC_MESSAGES/app.po	Mon Jul 02 18:00:18 2018 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: wamosjs 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-02 12:51+0200\n"
+"POT-Creation-Date: 2018-07-02 17:56+0200\n"
 "PO-Revision-Date: 2018-06-29 13:23+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -28,3 +28,12 @@
 #: src/views/Login.vue:11
 msgid "Login failed"
 msgstr ""
+
+#: src/views/Login.vue:115
+#, fuzzy
+msgid "Enter passphrase"
+msgstr "Forgot password"
+
+#: src/views/Login.vue:118
+msgid "Enter email"
+msgstr ""
--- a/client/src/locale/en_GB/LC_MESSAGES/app.po~	Mon Jul 02 16:30:29 2018 +0200
+++ b/client/src/locale/en_GB/LC_MESSAGES/app.po~	Mon Jul 02 18:00:18 2018 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: wamosjs 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-29 13:23+0200\n"
+"POT-Creation-Date: 2018-07-02 17:55+0200\n"
 "PO-Revision-Date: 2018-06-29 13:23+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -24,3 +24,16 @@
 #: src/views/Login.vue:22
 msgid "Login"
 msgstr "Login"
+
+#: src/views/Login.vue:11
+msgid "Login failed"
+msgstr ""
+
+#: src/views/Login.vue:115
+#, fuzzy
+msgid "Enter password"
+msgstr "Forgot password"
+
+#: src/views/Login.vue:118
+msgid "Enter email"
+msgstr ""
--- a/client/src/locale/it_IT/LC_MESSAGES/app.po	Mon Jul 02 16:30:29 2018 +0200
+++ b/client/src/locale/it_IT/LC_MESSAGES/app.po	Mon Jul 02 18:00:18 2018 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: wamosjs 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-02 12:51+0200\n"
+"POT-Creation-Date: 2018-07-02 17:56+0200\n"
 "PO-Revision-Date: 2018-06-29 13:23+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -29,3 +29,11 @@
 #: src/views/Login.vue:11
 msgid "Login failed"
 msgstr ""
+
+#: src/views/Login.vue:115
+msgid "Enter passphrase"
+msgstr ""
+
+#: src/views/Login.vue:118
+msgid "Enter email"
+msgstr ""
--- a/client/src/locale/it_IT/LC_MESSAGES/app.po~	Mon Jul 02 16:30:29 2018 +0200
+++ b/client/src/locale/it_IT/LC_MESSAGES/app.po~	Mon Jul 02 18:00:18 2018 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: wamosjs 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-29 13:24+0200\n"
+"POT-Creation-Date: 2018-07-02 17:55+0200\n"
 "PO-Revision-Date: 2018-06-29 13:23+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -25,3 +25,15 @@
 #: src/views/Login.vue:22
 msgid "Login"
 msgstr ""
+
+#: src/views/Login.vue:11
+msgid "Login failed"
+msgstr ""
+
+#: src/views/Login.vue:115
+msgid "Enter password"
+msgstr ""
+
+#: src/views/Login.vue:118
+msgid "Enter email"
+msgstr ""
--- a/client/src/views/Login.vue	Mon Jul 02 16:30:29 2018 +0200
+++ b/client/src/views/Login.vue	Mon Jul 02 18:00:18 2018 +0200
@@ -1,4 +1,4 @@
-<template>
+(<template>
   <div :class="loginStyle">
     <div>
       <div class="logogroup d-flex flex-row justify-content-center">
@@ -12,10 +12,10 @@
              <span class="loginerror"><translate>Login failed</translate></span>
            </div>
         <div class="input-group mb-3 emailgroup">
-          <input type="text" v-model="username" id="inputEmail" class="form-control" placeholder="emailLabel" required autofocus>
+          <input type="text" v-model="username" id="inputEmail" class="form-control" :placeholder="emailLabel" required autofocus>
         </div>
         <div class="input-group mb-3 passwordgroup">
-          <input :type="isPasswordVisible" v-model="password" id="inputPassword" class="form-control" placeholder="passwordLabel" required>
+          <input :type="isPasswordVisible" v-model="password" id="inputPassword" class="form-control" :placeholder="passwordLabel" required>
           <div class="input-group-append">
             <span class="input-group-text" id="basic-addon2" @click="showPassword"><i :class="eyeIcon"></i></span>
           </div>
@@ -26,7 +26,7 @@
       </form>
     </div>
   </div>
-</template>
+</template>)
 
 <style lang="scss">
 @import "../assets/application.scss";
@@ -111,6 +111,12 @@
     };
   },
   computed: {
+    passwordLabel() {
+      return this.$gettext("Enter passphrase");
+    },
+    emailLabel() {
+      return this.$gettext("Enter email");
+    },
     isPasswordVisible() {
       return this.readablePassword ? "text" : "password";
     },