Mercurial > gemma

changeset 1412:15c3672e2e86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
translations readded
author Thomas Junk <thomas.junk@intevation.de>
date Thu, 29 Nov 2018 09:43:16 +0100
parents d0090a5b8f9d
children c5e004b97394
files client/src/components/map/contextbox/ImportSoundingresults.vue client/src/components/map/contextbox/Staging.vue client/yarn.lock
diffstat 3 files changed, 45 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/map/contextbox/ImportSoundingresults.vue	Thu Nov 29 09:41:35 2018 +0100
+++ b/client/src/components/map/contextbox/ImportSoundingresults.vue	Thu Nov 29 09:43:16 2018 +0100
@@ -1,23 +1,29 @@
 <template>
   <div>
     <h6 class="mb-0 py-2 px-3 border-bottom d-flex align-items-center">
-      <font-awesome-icon icon="upload" class="mr-2"></font-awesome-icon>Import
-      Soundingresults
+      <font-awesome-icon icon="upload" class="mr-2"></font-awesome-icon>
+      <translate>Import Soundingresults</translate>
     </h6>
     <div v-if="editState" class="ml-auto mr-auto mt-4 w-95">
       <div class="d-flex flex-column">
         <div class="d-flex flex-row">
           <div class="mt-1 text-left w-50 ml-2 mr-4">
-            <small class="text-muted">Bottleneck</small>
+            <small class="text-muted">
+              <translate>Bottleneck</translate>
+            </small>
             <select v-model="bottleneck" class="custom-select">
               <option v-for="bottleneck in availableBottlenecks" :key="bottleneck">{{bottleneck}}</option>
             </select>
             <span class="text-danger">
-              <small v-if="!bottleneck">Please select a bottleneck</small>
+              <small v-if="!bottleneck">
+                <translate>Please select a bottleneck</translate>
+              </small>
             </span>
           </div>
           <div class="mt-1 text-left w-50 mr-2">
-            <small class="text-muted">Projection</small>
+            <small class="text-muted">
+              <translate>Projection</translate>
+            </small>
             <select v-model="projection" class="custom-select" id="depthreference">
               <option
                 v-for="projection in this.$options.projections"
@@ -25,13 +31,17 @@
               >{{ projection }}</option>
             </select>
             <span class="text-left text-danger">
-              <small v-if="!projection">Please enter a projection</small>
+              <small v-if="!projection">
+                <translate>Please enter a projection</translate>
+              </small>
             </span>
           </div>
         </div>
         <div class="d-flex flex-row">
           <div class="mt-1 text-left w-50 ml-2 mr-4">
-            <small class="text-muted">Depthreference</small>
+            <small class="text-muted">
+              <translate>Depthreference</translate>
+            </small>
             <select v-model="depthReference" class="custom-select" id="depthreference">
               <option
                 v-for="option in this.$options.depthReferenceOptions"
@@ -39,7 +49,9 @@
               >{{ option }}</option>
             </select>
             <span class="text-left text-danger">
-              <small v-if="!depthReference">Please enter a reference</small>
+              <small v-if="!depthReference">
+                <translate>Please enter a reference</translate>
+              </small>
             </span>
           </div>
           <div class="mt-1 text-left w-50 mr-2">
@@ -54,7 +66,9 @@
               v-model="importDate"
             >
             <span class="text-left text-danger">
-              <small v-if="!importDate">Please enter a date</small>
+              <small v-if="!importDate">
+                <translate>Please enter a date</translate>
+              </small>
             </span>
           </div>
         </div>
@@ -90,13 +104,12 @@
           download="meta.json"
           :href="dataLink"
           class="btn btn-outline-info pull-left"
-        >Download Meta.json</a>
-        <button
-          v-if="editState"
-          @click="deleteTempData"
-          class="btn btn-danger"
-          type="button"
-        >Cancel Upload</button>
+        >
+          <translate>Download Meta.json</translate>
+        </a>
+        <button v-if="editState" @click="deleteTempData" class="btn btn-danger" type="button">
+          <translate>Cancel Upload</translate>
+        </button>
         <button
           :disabled="disableUploadButton"
           @click="submit"
--- a/client/src/components/map/contextbox/Staging.vue	Thu Nov 29 09:41:35 2018 +0100
+++ b/client/src/components/map/contextbox/Staging.vue	Thu Nov 29 09:43:16 2018 +0100
@@ -7,11 +7,21 @@
     <table class="table mb-0">
       <thead>
         <tr>
-          <th>Name</th>
-          <th>Type</th>
-          <th>Date</th>
-          <th>Imported</th>
-          <th>Username</th>
+          <th>
+            <translate>Name</translate>
+          </th>
+          <th>
+            <translate>Type</translate>
+          </th>
+          <th>
+            <translate>Date</translate>
+          </th>
+          <th>
+            <translate>Imported</translate>
+          </th>
+          <th>
+            <translate>Username</translate>
+          </th>
           <th>&nbsp;</th>
           <th>&nbsp;</th>
         </tr>
--- a/client/yarn.lock	Thu Nov 29 09:41:35 2018 +0100
+++ b/client/yarn.lock	Thu Nov 29 09:43:16 2018 +0100
@@ -3802,7 +3802,7 @@
   resolved "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.0.tgz#12c91b3085a37f0baa336e9486eac4bf94e3e788"
   integrity sha1-EskbMIWjfwuqM26UhurEv5Tj54g=
 
-easygettext@^2.4.0:
+easygettext@^2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/easygettext/-/easygettext-2.7.0.tgz#35eecf687f817baa10d2fd5dc66ef47caade56d5"
   integrity sha512-BaoyxsZtre7Ndvgz3utjrE/6Yo8Txsc4m33ehQ0pBNX3HjcjGQozDhnpqSRhaeD8PQAk0Rgq3vhI+YJvQu0vUQ==