Mercurial > gemma

changeset 2595:dda4cec8e67b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
client:translations: correct some strings marking
author Fadi Abbud <fadi.abbud@intevation.de>
date Tue, 12 Mar 2019 11:44:29 +0100
parents ecec6d5aae00
children 8774054959a7
files client/src/components/ImportStretches.vue client/src/components/Popup.vue client/src/components/importschedule/Importschedule.vue client/src/components/usermanagement/Usermanagement.vue
diffstat 4 files changed, 18 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/ImportStretches.vue	Tue Mar 12 11:14:56 2019 +0100
+++ b/client/src/components/ImportStretches.vue	Tue Mar 12 11:44:29 2019 +0100
@@ -384,7 +384,7 @@
           callback: () => {
             displayInfo({
               title: this.$gettext("Not implemented"),
-              message: this.$gettext("Deleting " + stretch.id)
+              message: this.$gettext("Deleting ") + stretch.id
             });
           }
         },
--- a/client/src/components/Popup.vue	Tue Mar 12 11:14:56 2019 +0100
+++ b/client/src/components/Popup.vue	Tue Mar 12 11:44:29 2019 +0100
@@ -22,7 +22,8 @@
               class="fa-fw"
               v-if="popup.cancel.icon"
             />
-            {{ popup.cancel.label || $gettext("Cancel") }}
+            <span v-if="popup.cancel.label">{{ popup.cancel.label }}</span>
+            <translate v-else>Cancel</translate>
           </button>
           <span />
           <button
@@ -36,6 +37,8 @@
               v-if="popup.confirm.icon"
             />
             {{ popup.confirm.label || $gettext("Confirm") }}
+            <span v-if="popup.confirm.label">{{ popup.confirm.label }}</span>
+            <translate v-else>Confirm</translate>
           </button>
         </div>
       </div>
--- a/client/src/components/importschedule/Importschedule.vue	Tue Mar 12 11:14:56 2019 +0100
+++ b/client/src/components/importschedule/Importschedule.vue	Tue Mar 12 11:44:29 2019 +0100
@@ -171,11 +171,11 @@
       this.$store.commit("application/popup", {
         icon: "trash",
         title: this.$gettext("Delete Import"),
-        content: this.$gettext(
-          `Do you really want to delete the import with ID <b>${
-            schedule.id
-          }</b> of type <b>${schedule.kind.toUpperCase()}</b>?`
-        ),
+        content:
+          this.$gettext("Do you really want to delete the import with ID") +
+          `<b>${schedule.id}</b>` +
+          this.$gettext("of type") +
+          `<b>${schedule.kind.toUpperCase()}</b>?`,
         confirm: {
           label: this.$gettext("Delete"),
           icon: "trash",
--- a/client/src/components/usermanagement/Usermanagement.vue	Tue Mar 12 11:14:56 2019 +0100
+++ b/client/src/components/usermanagement/Usermanagement.vue	Tue Mar 12 11:44:29 2019 +0100
@@ -40,7 +40,7 @@
               <button
                 @click="sendTestMail(user.user)"
                 class="btn btn-sm btn-dark mr-1"
-                v-tooltip="$gettext('Send testmail')"
+                v-tooltip="sendMailLabel"
                 v-if="user.email"
               >
                 <font-awesome-icon icon="paper-plane"></font-awesome-icon>
@@ -48,7 +48,7 @@
               <button
                 @click="deleteUser(user.user)"
                 class="btn btn-sm btn-dark"
-                v-tooltip="$gettext('Delete user')"
+                v-tooltip="deleteUserLabel"
               >
                 <font-awesome-icon icon="trash" />
               </button>
@@ -169,6 +169,12 @@
       "currentUser"
     ]),
     ...mapState("application", ["showSidebar"]),
+    sendMailLabel() {
+      return this.$gettext("Send testmail");
+    },
+    deleteUserLabel() {
+      return this.$gettext("Delete user");
+    },
     sortedUsers() {
       const start = (this.currentPage - 1) * this.pageSize;
       return this.users