proxmox-mirrors/pmg-gui
1
0
Fork 0
mirror of https://git.proxmox.com/git/pmg-gui synced 2025-08-08 10:54:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix gettext invocations

Browse Source 
using gettext the way we did, broke the jsgettext.pl in proxmox-i18n
during a 'make update'

instead of using the template way, simply replace it by using plain
gettext as a function, this way we do not skip over the getttext uses
accidentally

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2019-03-07 14:21:58 +01:00 committed by Thomas Lamprecht
parent c29d577dc9
commit a827641e33
5 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/mobile/app.js
View File

@ -26,7 +26,6 @@ var app = new Framework7({
async: function(routeTo, routeFrom, resolve, reject) { async: function(routeTo, routeFrom, resolve, reject) {
let action = routeTo.params.action; let action = routeTo.params.action;
let mailid = routeTo.params.mailid; let mailid = routeTo.params.mailid;
let confirmText = gettext('')
app.dialog.confirm( app.dialog.confirm(
`${action}: ${mailid}`, `${action}: ${mailid}`,
gettext('Confirm'), gettext('Confirm'),

6
js/mobile/loginscreen.js
View File

@ -16,7 +16,7 @@ class LoginScreen extends Component {
<div class="item-inner"> <div class="item-inner">
<div class="item-title item-label">Username</div> <div class="item-title item-label">Username</div>
<div class="item-input-wrap"> <div class="item-input-wrap">
<input type="text" name="username" placeholder="{{gettext 'Username'}}" required validate> <input type="text" name="username" placeholder="` + gettext('Username') + `" required validate>
<span class="input-clear-button"></span> <span class="input-clear-button"></span>
</div> </div>
</div> </div>
@ -25,7 +25,7 @@ class LoginScreen extends Component {
<div class="item-inner"> <div class="item-inner">
<div class="item-title item-label">Password</div> <div class="item-title item-label">Password</div>
<div class="item-input-wrap"> <div class="item-input-wrap">
<input type="password" name="password" placeholder="{{gettext 'Password'}}" required validate> <input type="password" name="password" placeholder="` + gettext('Password') + `" required validate>
<span class="input-clear-button"></span> <span class="input-clear-button"></span>
</div> </div>
</div> </div>
@ -35,7 +35,7 @@ class LoginScreen extends Component {
<div class="list"> <div class="list">
<ul> <ul>
<li> <li>
<input type="submit" class="button" value='{{gettext "Log In"}}'> <input type="submit" class="button" value='` + gettext("Log In") + `'>
</li> </li>
</ul> </ul>
</div> </div>

10
js/mobile/mailview.js
View File

@ -7,7 +7,7 @@ class MailView extends Component {
<div class="left"> <div class="left">
<a href="#" class="link back"> <a href="#" class="link back">
<i class="icon icon-back"></i> <i class="icon icon-back"></i>
<span class="ios-only">{{gettext "Back"}}</span> <span class="ios-only">` + gettext("Back") + `</span>
</a> </a>
</div> </div>
<div class="title">Preview</div> <div class="title">Preview</div>
@ -26,28 +26,28 @@ class MailView extends Component {
<i class="icon f7-icons ios-only">close</i> <i class="icon f7-icons ios-only">close</i>
<i class="icon material-icons md-only">close</i> <i class="icon material-icons md-only">close</i>
</span> </span>
<span class="fab-label">{{gettext "Blacklist"}}</span> <span class="fab-label">` + gettext("Blacklist") + `</span>
</a> </a>
<a href="/mail/{{mailid}}/whitelist" class="fab-label-button fab-close"> <a href="/mail/{{mailid}}/whitelist" class="fab-label-button fab-close">
<span> <span>
<i class="icon f7-icons ios-only">check</i> <i class="icon f7-icons ios-only">check</i>
<i class="icon material-icons md-only">check</i> <i class="icon material-icons md-only">check</i>
</span> </span>
<span class="fab-label">{{gettext "Whitelist"}}</span> <span class="fab-label">` + gettext("Whitelist") + `</span>
</a> </a>
<a href="/mail/{{mailid}}/delete" class="fab-label-button fab-close"> <a href="/mail/{{mailid}}/delete" class="fab-label-button fab-close">
<span> <span>
<i class="icon f7-icons ios-only">trash</i> <i class="icon f7-icons ios-only">trash</i>
<i class="icon material-icons md-only">delete</i> <i class="icon material-icons md-only">delete</i>
</span> </span>
<span class="fab-label">{{gettext "Delete"}}</span> <span class="fab-label">` + gettext("Delete") + `</span>
</a> </a>
<a href="/mail/{{mailid}}/deliver" class="fab-label-button fab-close"> <a href="/mail/{{mailid}}/deliver" class="fab-label-button fab-close">
<span> <span>
<i class="icon f7-icons ios-only">paper_plane</i> <i class="icon f7-icons ios-only">paper_plane</i>
<i class="icon material-icons md-only">send</i> <i class="icon material-icons md-only">send</i>
</span> </span>
<span class="fab-label">{{gettext "Deliver"}}</span> <span class="fab-label">` + gettext("Deliver") + `</span>
</a> </a>
</div> </div>
</div> </div>

18
js/mobile/quarantineview.js
View File

@ -12,12 +12,12 @@ class QuarantineView extends Component {
</div> </div>
</div> </div>
<div class="settings-form elevation-5 fab-morph-target"> <div class="settings-form elevation-5 fab-morph-target">
<div class="block-title block-title-medium">{{gettext "Range"}}</div> <div class="block-title block-title-medium">` + gettext("Range") + `</div>
<div class="list no-hairlines-md"> <div class="list no-hairlines-md">
<ul> <ul>
<li class="item-content item-input"> <li class="item-content item-input">
<div class="item-inner"> <div class="item-inner">
<div class="item-title item-label">{{gettext "From"}}</div> <div class="item-title item-label">` + gettext("From") + `</div>
<div class="item-input-wrap"> <div class="item-input-wrap">
<input type="date" name="from" placeholder="from" required validate> <input type="date" name="from" placeholder="from" required validate>
</div> </div>
@ -25,14 +25,14 @@ class QuarantineView extends Component {
</li> </li>
<li class="item-content item-input"> <li class="item-content item-input">
<div class="item-inner"> <div class="item-inner">
<div class="item-title item-label">{{gettext "To"}}</div> <div class="item-title item-label">` + gettext("To") + `</div>
<div class="item-input-wrap"> <div class="item-input-wrap">
<input type="date" name="to" placeholder="to" required validate> <input type="date" name="to" placeholder="to" required validate>
</div> </div>
</div> </div>
</li> </li>
</ul> </ul>
<a class="button fab-close range-form">{{gettext "OK"}}</a> <a class="button fab-close range-form">` + gettext("OK") + `</a>
</div> </div>
</div> </div>
<div class="fab fab-morph fab-right-bottom" data-morph-to=".settings-form"> <div class="fab fab-morph fab-right-bottom" data-morph-to=".settings-form">
@ -47,7 +47,7 @@ class QuarantineView extends Component {
<i class="icon f7-icons ios-only color-yellow">alert</i> <i class="icon f7-icons ios-only color-yellow">alert</i>
<i class="icon material-icons md-only color-yellow">warning</i> <i class="icon material-icons md-only color-yellow">warning</i>
<span class="subscription-text"> <span class="subscription-text">
{{gettext "No valid subscription"}} ` + gettext("No valid subscription") + `
</span> </span>
</a> </a>
</div> </div>
@ -78,24 +78,24 @@ class QuarantineView extends Component {
<a href="/mail/{{id}}/deliver" class="color-green swipeout-close"> <a href="/mail/{{id}}/deliver" class="color-green swipeout-close">
<i class="icon f7-icons ios-only">paper_plane</i> <i class="icon f7-icons ios-only">paper_plane</i>
<i class="icon material-icons md-only">send</i> <i class="icon material-icons md-only">send</i>
&nbsp;{{gettext "Deliver"}} &nbsp;` + gettext("Deliver") + `
</a> </a>
<a href="/mail/{{id}}/whitelist" class="swipeout-close"> <a href="/mail/{{id}}/whitelist" class="swipeout-close">
<i class="icon f7-icons ios-only">check</i> <i class="icon f7-icons ios-only">check</i>
<i class="icon material-icons md-only">check</i> <i class="icon material-icons md-only">check</i>
&nbsp;{{gettext "Whitelist"}} &nbsp;` + gettext("Whitelist") + `
</a> </a>
</div> </div>
<div class="swipeout-actions-right"> <div class="swipeout-actions-right">
<a href="/mail/{{id}}/blacklist" class="color-orange swipeout-close"> <a href="/mail/{{id}}/blacklist" class="color-orange swipeout-close">
<i class="icon f7-icons ios-only">close</i> <i class="icon f7-icons ios-only">close</i>
<i class="icon material-icons md-only">close</i> <i class="icon material-icons md-only">close</i>
&nbsp;{{gettext "Blacklist"}} &nbsp;` + gettext("Blacklist") + `
</a> </a>
<a href="/mail/{{id}}/delete" class="color-red swipeout-close"> <a href="/mail/{{id}}/delete" class="color-red swipeout-close">
<i class="icon f7-icons ios-only">trash</i> <i class="icon f7-icons ios-only">trash</i>
<i class="icon material-icons md-only">delete</i> <i class="icon material-icons md-only">delete</i>
&nbsp;{{gettext "Delete"}} &nbsp;` + gettext("Delete") + `
</a> </a>
</div> </div>
</li>`; </li>`;

4
js/mobile/utils.js
View File

@ -1,7 +1,3 @@
Template7.registerHelper('gettext', function(value) {
return gettext(value);
});
var PMG = { var PMG = {
Utils: { Utils: {
getCookie(name) { getCookie(name) {