Skip to content

Commit

Permalink
Merge pull request #370 from open-contracting/fix_translations
Browse files Browse the repository at this point in the history
Fix:Customize Dialog translations
  • Loading branch information
sorenabell committed Sep 23, 2021
2 parents 4b44f49 + 6ce0b63 commit 24f7cca
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 deletions.
18 changes: 13 additions & 5 deletions frontend/src/components/CustomizeTables/CustomizeDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@
<v-card-text class="pa-0">
<v-row no-gutters>
<v-col cols="11">
<h3 class="pt-1 mb-6 card-title">Not all arrays can be merged</h3>
<h3 class="pt-1 mb-6 card-title">
<translate> Not all arrays can be merged </translate>
</h3>
<div class="card-content">
<div>
It is not possible to merge some arrays as this will make it too large for use in Excel.
<translate>
It is not possible to merge some arrays as this will make it too large for use in Excel.
</translate>
</div>
<div class="options">Options:</div>
<div class="radio-wrapper">
Expand All @@ -28,8 +32,12 @@

<v-card-actions class="pa-0 mt-9">
<v-spacer></v-spacer>
<v-btn outlined height="40px" width="88px" class="cancel-btn" @click="dialog = false"> Cancel </v-btn>
<v-btn height="40px" width="105px" class="save-btn" @click="onContinueClick"> Continue </v-btn>
<v-btn outlined height="40px" width="88px" class="cancel-btn" @click="dialog = false">
<translate> Cancel </translate>
</v-btn>
<v-btn height="40px" width="105px" class="save-btn" @click="onContinueClick">
<translate> Continue </translate>
</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
Expand All @@ -51,7 +59,7 @@ export default {
radioOptins: [
{
value: 'keep',
label: 'Keep all tables unmerged and continue',
label: this.$gettext('Keep all tables unmerged and continue'),
},
],
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
</div>
</div>

<v-btn class="app-btn" :disabled="!cancelable" large @click="$emit('cancel')" color="gray-light">Cancel</v-btn>
<v-btn class="app-btn" :disabled="!cancelable" large @click="$emit('cancel')" color="gray-light">
<translate>Cancel</translate>
</v-btn>
</div>
</template>

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/views/UploadFile/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<translate> If you would like to convert CSV data to JSON, please use the older </translate>
<span>
<a href="https://open-contracting.github.io/spoonbill/" target="_blank">
Command-Line tool.
<translate> Command-Line tool. </translate>
</a>
</span>
<br />
Expand All @@ -57,7 +57,7 @@

<span>
<a href="https://standard.open-contracting.org/review/" target="_blank">
Data Review Tool
<translate> Data Review Tool </translate>
</a>
</span>
<translate> to check first. </translate>
Expand Down

0 comments on commit 24f7cca

Please sign in to comment.