From ec5b32a8c8b29149f06324e2eb86eb5d928c257d Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Fri, 25 Nov 2011 09:21:51 +0100 Subject: [PATCH] add more gettext markers --- debian/changelog.Debian | 6 ++++++ defines.mk | 2 +- www/manager/dc/StorageView.js | 23 +++++++++++------------ www/manager/storage/DirEdit.js | 30 +++++++++++++++++------------- www/manager/window/Edit.js | 6 +++--- 5 files changed, 38 insertions(+), 29 deletions(-) diff --git a/debian/changelog.Debian b/debian/changelog.Debian index d4631170..232eb0fe 100644 --- a/debian/changelog.Debian +++ b/debian/changelog.Debian @@ -1,3 +1,9 @@ +pve-manager (2.0-11) unstable; urgency=low + + * start i18n support + + -- Proxmox Support Team Fri, 25 Nov 2011 09:23:00 +0100 + pve-manager (2.0-10) unstable; urgency=low * add context menus diff --git a/defines.mk b/defines.mk index fa0b762f..75e38acd 100644 --- a/defines.mk +++ b/defines.mk @@ -2,7 +2,7 @@ RELEASE=2.0 VERSION=2.0 PACKAGE=pve-manager -PACKAGERELEASE=10 +PACKAGERELEASE=11 BINDIR=${DESTDIR}/usr/bin PERLLIBDIR=${DESTDIR}/usr/share/perl5 diff --git a/www/manager/dc/StorageView.js b/www/manager/dc/StorageView.js index 797e623c..2653c7fd 100644 --- a/www/manager/dc/StorageView.js +++ b/www/manager/dc/StorageView.js @@ -51,13 +51,13 @@ Ext.define('PVE.dc.StorageView', { }; var edit_btn = new Ext.Button({ - text: 'Edit', + text: gettext('Edit'), disabled: true, handler: run_editor }); var remove_btn = new Ext.Button({ - text: 'Remove', + text: gettext('Remove'), disabled: true, handler: function(){ var sm = me.getSelectionModel(); @@ -67,10 +67,9 @@ Ext.define('PVE.dc.StorageView', { return; } - var msg = "Are you sure you want to remove storage: '" + - rec.data.storage + "'"; + var msg = Ext.String.format(gettext('Are you sure you want to remove storage {0}?'), "'" + rec.data.storage + "'"); - Ext.Msg.confirm('Deletion Confirmation', msg, function(btn) { + Ext.Msg.confirm(gettext('Confirm'), msg, function(btn) { if (btn !== 'yes') { return; } @@ -82,7 +81,7 @@ Ext.define('PVE.dc.StorageView', { reload(); }, failure: function (response, opts) { - Ext.Msg.alert('Error', response.htmlStatus); + Ext.Msg.alert(gettetx('Error'), response.htmlStatus); } }); }); @@ -112,7 +111,7 @@ Ext.define('PVE.dc.StorageView', { }, tbar: [ { - text: 'Add', + text: gettext('Add'), menu: new Ext.menu.Menu({ items: [ { @@ -159,20 +158,20 @@ Ext.define('PVE.dc.StorageView', { ], columns: [ { - header: 'Storage ID', + header: 'ID', width: 100, sortable: true, dataIndex: 'storage' }, { - header: 'Type', + header: gettext('Type'), width: 60, sortable: true, dataIndex: 'type', renderer: PVE.Utils.format_storage_type }, { - header: 'Content', + header: gettext('Content'), width: 150, sortable: true, dataIndex: 'content', @@ -191,14 +190,14 @@ Ext.define('PVE.dc.StorageView', { } }, { - header: 'Shared', + header: gettext('Shared'), width: 80, sortable: true, dataIndex: 'shared', renderer: PVE.Utils.format_boolean }, { - header: 'Enable', + header: gettext('Enable'), width: 80, sortable: true, dataIndex: 'disable', diff --git a/www/manager/storage/DirEdit.js b/www/manager/storage/DirEdit.js index ff2cd9d6..b193c68a 100644 --- a/www/manager/storage/DirEdit.js +++ b/www/manager/storage/DirEdit.js @@ -26,7 +26,7 @@ Ext.define('PVE.storage.DirInputPanel', { name: 'storage', height: 22, // hack: set same height as text fields value: me.storageId || '', - fieldLabel: 'Storage ID', + fieldLabel: 'ID', vtype: 'StorageId', allowBlank: false }, @@ -35,7 +35,7 @@ Ext.define('PVE.storage.DirInputPanel', { height: 22, // hack: set same height as text fields name: 'path', value: '', - fieldLabel: 'Directory', + fieldLabel: gettext('Directory'), allowBlank: false }, { @@ -43,7 +43,7 @@ Ext.define('PVE.storage.DirInputPanel', { name: 'content', value: 'images', multiSelect: true, - fieldLabel: 'Content', + fieldLabel: gettext('Content'), allowBlank: false } ]; @@ -54,13 +54,13 @@ Ext.define('PVE.storage.DirInputPanel', { name: 'enable', checked: true, uncheckedValue: 0, - fieldLabel: 'Enable' + fieldLabel: gettext('Enable') }, { xtype: 'pvecheckbox', name: 'shared', uncheckedValue: 0, - fieldLabel: 'Shared' + fieldLabel: gettext('Shared') } ]; @@ -68,8 +68,9 @@ Ext.define('PVE.storage.DirInputPanel', { me.column2.unshift({ xtype: 'PVE.form.NodeSelector', name: 'nodes', - fieldLabel: 'Nodes', - emptyText: 'All (no restrictions)', + fieldLabel: gettext('Nodes'), + emptyText: gettext('All') + ' (' + + gettext('No restrictions') +')', multiSelect: true, autoSelect: false }); @@ -99,13 +100,16 @@ Ext.define('PVE.storage.DirEdit', { create: me.create, storageId: me.storageId }); - - Ext.apply(me, { - title: me.create ? "Create directory storage" : - "Edit directory storage '" + me.storageId + "'", - items: [ ipanel ] - }); + me.items = [ ipanel ]; + + if (me.create) { + me.title = gettext('Create directory storage'); + } else { + me.title = Ext.String.format(gettext('Edit directory storage {0}'), + "'" + me.storageId + "'"); + } + me.callParent(); if (!me.create) { diff --git a/www/manager/window/Edit.js b/www/manager/window/Edit.js index 4e2f81c9..eb122de9 100644 --- a/www/manager/window/Edit.js +++ b/www/manager/window/Edit.js @@ -84,7 +84,7 @@ Ext.define('PVE.window.Edit', { if (response.result.errors) { form.markInvalid(response.result.errors); } - Ext.Msg.alert('Error', response.htmlStatus); + Ext.Msg.alert(gettext('Error'), response.htmlStatus); }, success: function(response, options) { me.close(); @@ -121,7 +121,7 @@ Ext.define('PVE.window.Edit', { }); }, failure: function(response, opts) { - Ext.Msg.alert('Error', response.htmlStatus, function() { + Ext.Msg.alert(gettext('Error'), response.htmlStatus, function() { me.close(); }); } @@ -163,7 +163,7 @@ Ext.define('PVE.window.Edit', { var form = me.formPanel.getForm(); var submitBtn = Ext.create('Ext.Button', { - text: me.create ? 'Create' : 'OK', + text: me.create ? gettext('Create') : gettext('OK'), disabled: !me.create, handler: function() { me.submit();