- Kimchi-devel - oVirt List Archives

Re: [Kimchi-devel] [PATCH v2][Wok 5/8] Load Wok Server after options checkings
by Aline Manera 08 Jun '16

08 Jun '16

On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > This patch moves Server.py import right before instanciate the class. > Then all following imports and initializations required by Server module > are done after command line options checkings. > This way avoid problems like init and load plugins then wokd stops due > to wrong command line option. Could you explain better the problem? I checked server.py and there is no function being called on this module. Seems it is an workaround to a deeper issue. > > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > src/wokd.in | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/src/wokd.in b/src/wokd.in > index 962581d..3cf90f8 100644 > --- a/src/wokd.in > +++ b/src/wokd.in > @@ -27,7 +27,6 @@ sys.path.insert(1, '@pythondir@') > > from optparse import OptionParser > > -import wok.server > import wok.config as config > > > @@ -100,6 +99,11 @@ def main(options): > setattr(options, 'max_body_size', > config.config.get('server', 'max_body_size')) > > + > + # Wok Server module must be imported after options checkings. Otherwise it > + # is possible that server start some functions and then fail due to wrong > + # parameters passed > + import wok.server > wok.server.main(options) > > if __name__ == '__main__':

2 1

[RFC] Change guest boot order on REST API
by Ramon Medeiros 08 Jun '16

08 Jun '16

Propose: Kimchi allow to change boot order ("fd", "hd", "cdrom" or "network") hd device can specify which disk will be booted Rest API will receive answer from /plugins/kimchi/<VM NAME>/bootorder {[{"dev": "hd"}]} or a list: {[{"dev": "hd"}, {"dev": "cdrom"}]} Doubts: How we can edit the bootloader? Like the list above or a kind of fixed list? Libvirt provides bootmenu too, which allows users to pick a device in the beginning. Must have it? -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

3 5

Re: [Kimchi-devel] [PATCH v2][Wok 3/8] Implements control/model of new plugin API
by Aline Manera 08 Jun '16

08 Jun '16

On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > src/wok/control/plugins.py | 31 ++++++++++++++++++++++++++++--- > src/wok/i18n.py | 3 +++ > src/wok/model/plugins.py | 38 ++++++++++++++++++++++++++++++-------- > 3 files changed, 61 insertions(+), 11 deletions(-) > > diff --git a/src/wok/control/plugins.py b/src/wok/control/plugins.py > index 57dfa1b..5c125eb 100644 > --- a/src/wok/control/plugins.py > +++ b/src/wok/control/plugins.py > @@ -19,11 +19,36 @@ > # License along with this library; if not, write to the Free Software > # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > > -from wok.control.base import SimpleCollection > +from wok.control.base import Collection, Resource, SimpleCollection > from wok.control.utils import UrlSubNode > > > -@UrlSubNode("plugins") > -class Plugins(SimpleCollection): > +@UrlSubNode("plugins", False) > +class PluginsSimple(SimpleCollection): > + """ > + Returns only enabled plugins in order to built initial Wok UI > + """ > + def __init__(self, model): > + super(PluginsSimple, self).__init__(model) > + pass > + > + > +@UrlSubNode("pluginsmanager", True) > +class Plugins(Collection): > def __init__(self, model): > super(Plugins, self).__init__(model) > + self.resource = Plugin > + self.admin_methods = ['GET'] > + > + > +class Plugin(Resource): > + def __init__(self, model, id): > + super(Plugin, self).__init__(model, id) > + self.uri_fmt = "/pluginsmanager/%s" > + self.enable = self.generate_action_handler('enable') > + self.disable = self.generate_action_handler('disable') > + self.admin_methods = ['GET', 'POST'] > + > + @property > + def data(self): > + return self.info > diff --git a/src/wok/i18n.py b/src/wok/i18n.py > index 4fc21f1..bda3949 100644 > --- a/src/wok/i18n.py > +++ b/src/wok/i18n.py > @@ -60,4 +60,7 @@ messages = { > "WOKRES0001L": _("Request made on resource"), > "WOKROOT0001L": _("User '%(username)s' logged in"), > "WOKROOT0002L": _("User '%(username)s' logged out"), > + > + "WOKPLUG0001E": _("Plugin '%(plugin_name)s' not found."), > + "WOKPLUG0002E": _("Error updating configuration file of plugin '%(plugin)s'."), > } > diff --git a/src/wok/model/plugins.py b/src/wok/model/plugins.py > index 4beff44..b0ac366 100644 > --- a/src/wok/model/plugins.py > +++ b/src/wok/model/plugins.py > @@ -3,8 +3,6 @@ > # > # Copyright IBM Corp, 2015-2016 > # > -# Code derived from Project Kimchi > -# Any reason to remove the above line? > # This library is free software; you can redistribute it and/or > # modify it under the terms of the GNU Lesser General Public > # License as published by the Free Software Foundation; either > @@ -19,9 +17,17 @@ > # License along with this library; if not, write to the Free Software > # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > > -import cherrypy > > -from wok.utils import get_enabled_plugins > +from wok.exception import NotFoundError > +from wok.pluginsmanager import Plugins > + > + > +class PluginsSimpleModel(object): > + def __init__(self, **kargs): > + pass > + > + def get_list(self): > + return Plugins().get_enabled_plugins() > > > class PluginsModel(object): > @@ -29,7 +35,23 @@ class PluginsModel(object): > pass > > def get_list(self): > - # Will only return plugins that were loaded correctly by WOK and are > - # properly configured in cherrypy > - return [plugin for (plugin, config) in get_enabled_plugins() > - if config.get('wok').get('uri') in cherrypy.tree.apps.keys()] > + return Plugins().get_all_plugins_names() > + > + > +class PluginModel(object): > + def __init__(self, **kargs): > + pass > + > + def lookup(self, plugin): > + info = Plugins().get_plugin_info(plugin) > + if not info: > + raise NotFoundError('WOKPLUG0001E', {'plugin_name': plugin}) > + > + return {'name': plugin, > + 'enabled': info['enabled']} > + > + def enable(self, plugin_name): > + Plugins().enable_plugin(plugin_name) > + > + def disable(self, plugin_name): > + Plugins().disable_plugin(plugin_name)

2 2

Re: [Kimchi-devel] [PATCH v2][Wok 4/8] Change plugins API documentation by pluginsmanager API
by Aline Manera 08 Jun '16

08 Jun '16

On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > This patch creates the documentation for pluginsmanager API > > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > docs/API/plugins.md | 13 ---------- > docs/API/pluginsmanager.md | 61 ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 61 insertions(+), 13 deletions(-) > delete mode 100644 docs/API/plugins.md > create mode 100644 docs/API/pluginsmanager.md > > diff --git a/docs/API/plugins.md b/docs/API/plugins.md > deleted file mode 100644 > index aaa37b5..0000000 > --- a/docs/API/plugins.md > +++ /dev/null > @@ -1,13 +0,0 @@ > -## REST API Specification for Plugins > - > -### Collection: Plugins > - > -**URI:** /plugins > - > -**Methods:** > - > -* **GET**: Retrieve a summarized list names of all UI Plugins > - > -#### Examples > -GET /plugins > -[pluginA, pluginB, pluginC] You should keep this file there for the /plugins API. > diff --git a/docs/API/pluginsmanager.md b/docs/API/pluginsmanager.md > new file mode 100644 > index 0000000..b79c8ad > --- /dev/null > +++ b/docs/API/pluginsmanager.md > @@ -0,0 +1,61 @@ > +## REST API Specification for Plugins Manager > + > +### Collection: Plugins > + > +**URI:** /pluginsmanager > + > +**Methods:** > + > +* **GET**: Retrieve a list of all Plugins configured in Wok, showing name and state. > + > +#### Examples > +GET /pluginsmanager > +[ > + { > + "enabled":true, > + "name":"gingerbase" > + }, > + { > + "enabled":true, > + "name":"kimchi" > + }, > + { > + "enabled":false, > + "name":"sample" > + } > +] > + Maybe it would be good to have the 'uri' listed among of those plugin info. > +### Resource: Plugin > + > +**URI:** /pluginsmanager/*:name* > + > +A plugin represents a software that will make use of infrastructure provided > +by Wok. It should be installed in a directory with its <name> in Wok directory > +'plugins' and contains an <name>.conf file. > +Example: "/usr/lib/python2.7/site-packages/wok/plugins/kimchi" > + > +**Methods:** > + > +* **GET**: Retrieve the full description of the plugin. > + * name: The plugin name > + * enabled: State of the plugin. If not enabled, Wok will not load it > +* **POST**: *See Task Actions* > + > +**Actions (POST):** > + > +* enable: enable a plugin. Also changes plugin's configuration file > + > +* disable: disable a plugin. Also changes plugin's configuration file > + > +#### Examples > +GET /pluginsmanager/sample > +{ > + "enabled":false, > + "name":"sample" > +} > + > +POST /pluginsmanager/sample/enable > +{ > + "enabled":true, > + "name":"sample" > +} Add an example for 'disable' action

2 1

[PATCH] [Wok 0/6] Log failed user requests
by Lucio Correia 08 Jun '16

08 Jun '16

This patch requires "[Kimchi] Do not break the logging of failed requests". Otherwise, some tests will be broken. Lucio Correia (6): Revert "Use past verbs" Parse request before authorization check Use status code 200 for PUT requests on resource Log failed login/logout attempts Log failed user requests Add status code to request log message src/wok/control/base.py | 164 ++++++++++++++++++++++++++++++------------------ src/wok/i18n.py | 4 +- src/wok/reqlogger.py | 10 +-- src/wok/root.py | 44 +++++++++---- 4 files changed, 140 insertions(+), 82 deletions(-) -- 1.9.1

2 9

[PATCH][Kimchi 3/5] Update REST API
by Ramon Medeiros 08 Jun '16

08 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- API.json | 12 ++++++++++++ i18n.py | 2 ++ 2 files changed, 14 insertions(+) diff --git a/API.json b/API.json index 8d4f725..d0e6831 100644 --- a/API.json +++ b/API.json @@ -294,6 +294,18 @@ "minLength": 1, "error": "KCHVM0011E" }, + "boot": { + "description": "Boot order and bootmenu configuration", + "type": "object", + "error": "KCHVM0052E", + "properties": { + "order": { + "description": "Boot order", + "type": "array", + "error": "KCHVM0053E" + } + } + }, "users": { "description": "Array of users who have permission to the VM", "type": "array", diff --git a/i18n.py b/i18n.py index 2d8390f..ec060ae 100644 --- a/i18n.py +++ b/i18n.py @@ -103,6 +103,8 @@ messages = { "KCHVM0049E": _("Cannot power off %(name)s. Virtual machine is shut off."), "KCHVM0050E": _("Cannot shutdown %(name)s. Virtual machine is shut off."), "KCHVM0051E": _("Cannot reset %(name)s. Virtual machine is already shut off."), + "KCHVM0052E": _("Boot configuration must have order list"), + "KCHVM0053E": _("Boot order must be a list of the devices"), "KCHVM0055E": _("Migrate to localhost %(host)s is not allowed."), "KCHVM0056E": _("To migrate a virtual machine to the remote host %(host)s the user %(user)s must have password-less login to the remote host."), -- 2.5.5

2 4

[PATCH][Kimchi 1/5] Create method to change bootorder of a guest
by Ramon Medeiros 08 Jun '16

08 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- model/vms.py | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index b0b4eb2..854cd04 100644 --- a/model/vms.py +++ b/model/vms.py @@ -81,7 +81,7 @@ VM_ONLINE_UPDATE_PARAMS = ['graphics', 'groups', 'memory', 'users'] # update parameters which are updatable when the VM is offline VM_OFFLINE_UPDATE_PARAMS = ['cpu_info', 'graphics', 'groups', 'memory', - 'name', 'users'] + 'name', 'users', 'boot'] XPATH_DOMAIN_DISK = "/domain/devices/disk[@device='disk']/source/@file" XPATH_DOMAIN_DISK_BY_FILE = "./devices/disk[@device='disk']/source[@file='%s']" @@ -736,6 +736,34 @@ class VMModel(object): else: remove_metadata_node(dom, 'name') + def _update_bootorder(self, xml, params): + # get element tree from xml + et = ET.fromstring(xml) + + # get machine type + os = et.find("os") + mtype = os.find("type") + + # create new element tree with new bootorder + new_os = E.os() + new_os.append(mtype) + + # iterate over new bootorder and build tag + for device in params["order"]: + + # skip devices not in list + if device not in ["hd", "cdrom", "network", "fd"]: + continue + + # add bootdevice + new_os.append(E.boot(dev=device)) + + # update <os> + et.remove(os) + et.append(new_os) + + return ET.tostring(et) + def _static_vm_update(self, vm_name, dom, params): old_xml = new_xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE) params = copy.deepcopy(params) @@ -782,6 +810,10 @@ class VMModel(object): if ('memory' in params and params['memory'] != {}): new_xml = self._update_memory_config(new_xml, params, dom) + # update bootorder + if "boot" in params: + new_xml = self._update_bootorder(new_xml, params["boot"]) + snapshots_info = [] conn = self.conn.get() try: -- 2.5.5

3 5

[PATCH][Kimchi 2/5] Update documentation about bootorder on vm update
by Ramon Medeiros 08 Jun '16

08 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- docs/API.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/API.md b/docs/API.md index 7072ab2..41635ee 100644 --- a/docs/API.md +++ b/docs/API.md @@ -174,6 +174,8 @@ server. * sockets - The maximum number of sockets to use. * cores - The number of cores per socket. * threads - The number of threads per core. + * boot: Update boot order and bootmenu + * order: list of devices to boot * **POST**: *See Virtual Machine Actions* -- 2.5.5

3 2

[PATCH] [Wok] Externlise the size units such as Ki, Mi, Gi, etc.
by pkulkark＠linux.vnet.ibm.com 08 Jun '16

08 Jun '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch externalises the size units such as KiB, MiB, GiB, etc that are added in wok.formatMeasurement method, and also updates the .pot and *.po files. Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- po/de_DE.po | 32 +++++++++++++++++++++++++++++++- po/en_US.po | 32 +++++++++++++++++++++++++++++++- po/es_ES.po | 32 +++++++++++++++++++++++++++++++- po/fr_FR.po | 32 +++++++++++++++++++++++++++++++- po/it_IT.po | 32 +++++++++++++++++++++++++++++++- po/ja_JP.po | 32 +++++++++++++++++++++++++++++++- po/ko_KR.po | 32 +++++++++++++++++++++++++++++++- po/pt_BR.po | 32 +++++++++++++++++++++++++++++++- po/ru_RU.po | 32 +++++++++++++++++++++++++++++++- po/wok.pot | 32 +++++++++++++++++++++++++++++++- po/zh_CN.po | 32 +++++++++++++++++++++++++++++++- po/zh_TW.po | 32 +++++++++++++++++++++++++++++++- ui/js/src/wok.utils.js | 7 ++++++- ui/pages/i18n.json.tmpl | 13 ++++++++++++- 14 files changed, 390 insertions(+), 14 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 0fb869d..c2b9a0a 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -201,6 +201,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Der Benutzername oder das Kennwort, den bzw. das Sie eingegeben haben, ist " diff --git a/po/en_US.po b/po/en_US.po index 73d7056..b31785b 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -195,6 +195,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 8acb513..d77c60e 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -201,6 +201,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "El nombre de usuario o contraseña que ha especificado es incorrecto. Por " diff --git a/po/fr_FR.po b/po/fr_FR.po index 9cc473a..065113b 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2014-08-27 21:30+0000\n" "Last-Translator: BobSynfig\n" "Language-Team: French (http://www.transifex.com/projects/p/kimchi/language/" @@ -204,6 +204,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Le nom d'utilisateur ou le mot de passe que vous avez entré est incorrect. " diff --git a/po/it_IT.po b/po/it_IT.po index ef3729d..d871172 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -201,6 +201,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Il nome utente o la password immessi non sono corretti. Ripetere " diff --git a/po/ja_JP.po b/po/ja_JP.po index dc8926f..cde5d87 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -199,6 +199,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "入力したユーザー名またはパスワードが誤っています。やり直してください。" diff --git a/po/ko_KR.po b/po/ko_KR.po index 84b4750..2ef50fb 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -196,6 +196,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "입력한 사용자 이름 또는 비밀번호가 올바르지 않습니다. 다시 시도하십시오." diff --git a/po/pt_BR.po b/po/pt_BR.po index a4ae451..75a6c9b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2015-03-23 12:57+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -217,6 +217,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "O usuário ou senha inseridos estão incorretos. Por favor, tente novamente." diff --git a/po/ru_RU.po b/po/ru_RU.po index 0e81ba4..392be6d 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2014-08-28 17:32+0000\n" "Last-Translator: Aline Manera <aline.manera(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/kimchi/language/" @@ -197,6 +197,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "Указано неверное имя пользователя или пароль. Введите еще раз." diff --git a/po/wok.pot b/po/wok.pot index 01b8a28..231cd33 100755 --- a/po/wok.pot +++ b/po/wok.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -195,6 +195,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 0a66eec..5d81cc5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2013-06-27 10:48+0000\n" "Last-Translator: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" "Language-Team: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" @@ -212,6 +212,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "用户名或密码错误，请重新输入。" diff --git a/po/zh_TW.po b/po/zh_TW.po index fd83384..ccd1d48 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -196,6 +196,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "您輸入的使用者名稱或密碼不正確。請重試。" diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index 1fb3c9b..8eb6f08 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -150,9 +150,14 @@ wok.changetoProperUnit = function(numOrg, digits, base) { var fixed = settings['fixed']; var unitMapping = unitBaseMapping[base]; + var unitmap = { 'Ki': 'WOKFMT2001M', 'Mi': 'WOKFMT2002M', 'Gi': 'WOKFMT2003M', + 'Ti': 'WOKFMT2004M', 'Pi': 'WOKFMT2005M', 'k': 'WOKFMT2006M', + 'M': 'WOKFMT2007M', 'G': 'WOKFMT2008M', 'T': 'WOKFMT2009M', + 'P': 'WOKFMT2010M'} for(var i = unitMapping.length - 1; i >= 0; i--) { var mapping = unitMapping[i]; - var suffix = mapping['us']; + var s_key = mapping['us']; + var suffix = i18n[unitmap[s_key]]; var startingValue = mapping['v']; if(number < startingValue) { continue; diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index ca7ae4c..94e90ac 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -49,5 +49,16 @@ "WOKSETT0009M": "$_("Showing {{ctx.start}} to {{ctx.end}} of {{ctx.total}} entries")", "WOKSETT0010M": "$_("No results found!")", "WOKSETT0011M": "$_("Loading...")", - "WOKSETT0012M": "$_("Actions")" + "WOKSETT0012M": "$_("Actions")", + + "WOKFMT2001M": "$_("Ki")", + "WOKFMT2002M": "$_("Mi")", + "WOKFMT2003M": "$_("Gi")", + "WOKFMT2004M": "$_("Ti")", + "WOKFMT2005M": "$_("Pi")", + "WOKFMT2006M": "$_("k")", + "WOKFMT2007M": "$_("M")", + "WOKFMT2008M": "$_("G")", + "WOKFMT2009M": "$_("T")", + "WOKFMT2010M": "$_("P")" } -- 2.1.0

2 2

Re: [Kimchi-devel] [PATCH] [Wok] Externlise the size units such as Ki, Mi, Gi, etc.
by Aline Manera 08 Jun '16

08 Jun '16

OK. Thanks for the inputs, Archana and Pooja. On 06/01/2016 03:54 AM, Archana Singh wrote: > > > On 6/1/2016 7:07 AM, Aline Manera wrote: >> >> >> On 05/31/2016 10:34 PM, Aline Manera wrote: >>> >>> >>> On 05/31/2016 06:00 AM, Pooja Kulkarni wrote: >>>> Hi Aline, >>>> >>>> I do not have a good example for this, but I did come across >>>> something while searching around. >>>> French use Ko (kilo-octet) instead of Kb as a unit of size. So this >>>> leads me to believe there could be other such scenarios while >>>> dealing with different locales. >>>> >>> >>> Hi Pooja, >>> >>> I don't think Ko is the same of KB. From a quick search over the >>> internet I found Ko = 8KB. So it is wrong to 'translate' that as the >>> backend will send the data always in KB. >>> >> >> Maybe we need more references on that to decide on what to do. > Found some more references: wiki > https://fr.wikipedia.org/wiki/M%C3%A9ga it says: > "le mébioctet Mio (en anglais MiB, pour mébibyte) qui représente 1 024 > (210) kibioctets, soit 1 048 576 (220) octets" . > which when translated in English it is "Mio mébioctet (English MiB for > mebibyte ), which represents 1024 (210) kibibytes or 1 048 576 (220) > bytes". > > And also I have tried translation of English "Byte" to french which is > "octet". >> >>>> Thanks, >>>> Pooja >>>> >>>> On 05/30/2016 08:52 PM, Aline Manera wrote: >>>>> >>>>> Hi Pooja, >>>>> >>>>> Isn't KiB, MiB, GiB, ect international units for computing ? >>>>> Do you have any example on which language they are 'translated' to >>>>> a different unit name? >>>>> >>>>> Thanks, >>>>> Aline Manera >>>>> >>>>> On 05/25/2016 06:55 AM, pkulkark(a)linux.vnet.ibm.com wrote: >>>>>> From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> >>>>>> >>>>>> This patch externalises the size >>>>>> units such as KiB, MiB, GiB, etc >>>>>> that are added in wok.formatMeasurement >>>>>> method, and also updates the .pot >>>>>> and *.po files. >>>>>> >>>>>> Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> >>>>>> --- >>>>>> po/de_DE.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/en_US.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/es_ES.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/fr_FR.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/it_IT.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/ja_JP.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/ko_KR.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/pt_BR.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/ru_RU.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/wok.pot | 32 +++++++++++++++++++++++++++++++- >>>>>> po/zh_CN.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/zh_TW.po | 32 +++++++++++++++++++++++++++++++- >>>>>> ui/js/src/wok.utils.js | 7 ++++++- >>>>>> ui/pages/i18n.json.tmpl | 13 ++++++++++++- >>>>>> 14 files changed, 390 insertions(+), 14 deletions(-) >>>>>> >>>>>> diff --git a/po/de_DE.po b/po/de_DE.po >>>>>> index 0fb869d..c2b9a0a 100644 >>>>>> --- a/po/de_DE.po >>>>>> +++ b/po/de_DE.po >>>>>> @@ -5,7 +5,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2013-07-11 17:32-0400\n" >>>>>> "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" >>>>>> "Language-Team: English\n" >>>>>> @@ -201,6 +201,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> "Der Benutzername oder das Kennwort, den bzw. das Sie >>>>>> eingegeben haben, ist " >>>>>> diff --git a/po/en_US.po b/po/en_US.po >>>>>> index 73d7056..b31785b 100644 >>>>>> --- a/po/en_US.po >>>>>> +++ b/po/en_US.po >>>>>> @@ -6,7 +6,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2013-07-11 17:32-0400\n" >>>>>> "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" >>>>>> "Language-Team: English\n" >>>>>> @@ -195,6 +195,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> >>>>>> diff --git a/po/es_ES.po b/po/es_ES.po >>>>>> index 8acb513..d77c60e 100644 >>>>>> --- a/po/es_ES.po >>>>>> +++ b/po/es_ES.po >>>>>> @@ -5,7 +5,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2013-07-11 17:32-0400\n" >>>>>> "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" >>>>>> "Language-Team: English\n" >>>>>> @@ -201,6 +201,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> "El nombre de usuario o contraseña que ha especificado es >>>>>> incorrecto. Por " >>>>>> diff --git a/po/fr_FR.po b/po/fr_FR.po >>>>>> index 9cc473a..065113b 100644 >>>>>> --- a/po/fr_FR.po >>>>>> +++ b/po/fr_FR.po >>>>>> @@ -5,7 +5,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2014-08-27 21:30+0000\n" >>>>>> "Last-Translator: BobSynfig\n" >>>>>> "Language-Team: French >>>>>> (http://www.transifex.com/projects/p/kimchi/language/" >>>>>> @@ -204,6 +204,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> "Le nom d'utilisateur ou le mot de passe que vous avez entré >>>>>> est incorrect. " >>>>>> diff --git a/po/it_IT.po b/po/it_IT.po >>>>>> index ef3729d..d871172 100644 >>>>>> --- a/po/it_IT.po >>>>>> +++ b/po/it_IT.po >>>>>> @@ -5,7 +5,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2013-07-11 17:32-0400\n" >>>>>> "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" >>>>>> "Language-Team: English\n" >>>>>> @@ -201,6 +201,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> "Il nome utente o la password immessi non sono corretti. >>>>>> Ripetere " >>>>>> diff --git a/po/ja_JP.po b/po/ja_JP.po >>>>>> index dc8926f..cde5d87 100644 >>>>>> --- a/po/ja_JP.po >>>>>> +++ b/po/ja_JP.po >>>>>> @@ -5,7 +5,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2013-07-11 17:32-0400\n" >>>>>> "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" >>>>>> "Language-Team: English\n" >>>>>> @@ -199,6 +199,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "入力したユーザー名またはパスワードが誤っています。やり直し >>>>>> てください。" >>>>>> >>>>>> diff --git a/po/ko_KR.po b/po/ko_KR.po >>>>>> index 84b4750..2ef50fb 100644 >>>>>> --- a/po/ko_KR.po >>>>>> +++ b/po/ko_KR.po >>>>>> @@ -5,7 +5,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2013-07-11 17:32-0400\n" >>>>>> "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" >>>>>> "Language-Team: English\n" >>>>>> @@ -196,6 +196,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> "입력한 사용자 이름 또는 비밀번호가 올바르지 않습니다. 다시 시도하 >>>>>> 십시오." >>>>>> diff --git a/po/pt_BR.po b/po/pt_BR.po >>>>>> index a4ae451..75a6c9b 100644 >>>>>> --- a/po/pt_BR.po >>>>>> +++ b/po/pt_BR.po >>>>>> @@ -20,7 +20,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 1.0\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2015-03-23 12:57+0000\n" >>>>>> "Last-Translator: Crístian Deives dos Santos Viana >>>>>> <cristiandeives@gmail." >>>>>> "com>\n" >>>>>> @@ -217,6 +217,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> "O usuário ou senha inseridos estão incorretos. Por favor, >>>>>> tente novamente." >>>>>> diff --git a/po/ru_RU.po b/po/ru_RU.po >>>>>> index 0e81ba4..392be6d 100644 >>>>>> --- a/po/ru_RU.po >>>>>> +++ b/po/ru_RU.po >>>>>> @@ -5,7 +5,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2014-08-28 17:32+0000\n" >>>>>> "Last-Translator: Aline Manera <aline.manera(a)gmail.com>\n" >>>>>> "Language-Team: Russian >>>>>> (http://www.transifex.com/projects/p/kimchi/language/" >>>>>> @@ -197,6 +197,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "Указано неверное имя пользователя или пароль. Введите >>>>>> еще раз." >>>>>> >>>>>> diff --git a/po/wok.pot b/po/wok.pot >>>>>> index 01b8a28..231cd33 100755 >>>>>> --- a/po/wok.pot >>>>>> +++ b/po/wok.pot >>>>>> @@ -8,7 +8,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: PACKAGE VERSION\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" >>>>>> "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" >>>>>> "Language-Team: LANGUAGE <LL(a)li.org>\n" >>>>>> @@ -195,6 +195,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> >>>>>> diff --git a/po/zh_CN.po b/po/zh_CN.po >>>>>> index 0a66eec..5d81cc5 100644 >>>>>> --- a/po/zh_CN.po >>>>>> +++ b/po/zh_CN.po >>>>>> @@ -20,7 +20,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2013-06-27 10:48+0000\n" >>>>>> "Last-Translator: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" >>>>>> "Language-Team: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" >>>>>> @@ -212,6 +212,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "用户名或密码错误，请重新输入。" >>>>>> >>>>>> diff --git a/po/zh_TW.po b/po/zh_TW.po >>>>>> index fd83384..ccd1d48 100644 >>>>>> --- a/po/zh_TW.po >>>>>> +++ b/po/zh_TW.po >>>>>> @@ -5,7 +5,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: kimchi 0.1\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2013-07-11 17:32-0400\n" >>>>>> "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" >>>>>> "Language-Team: English\n" >>>>>> @@ -196,6 +196,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "您輸入的使用者名稱或密碼不正確。請重試。" >>>>>> >>>>>> diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js >>>>>> index 1fb3c9b..8eb6f08 100644 >>>>>> --- a/ui/js/src/wok.utils.js >>>>>> +++ b/ui/js/src/wok.utils.js >>>>>> @@ -150,9 +150,14 @@ wok.changetoProperUnit = function(numOrg, >>>>>> digits, base) { >>>>>> var fixed = settings['fixed']; >>>>>> >>>>>> var unitMapping = unitBaseMapping[base]; >>>>>> + var unitmap = { 'Ki': 'WOKFMT2001M', 'Mi': >>>>>> 'WOKFMT2002M', 'Gi': 'WOKFMT2003M', >>>>>> + 'Ti': 'WOKFMT2004M', 'Pi': >>>>>> 'WOKFMT2005M', 'k': 'WOKFMT2006M', >>>>>> + 'M': 'WOKFMT2007M', 'G': 'WOKFMT2008M', >>>>>> 'T': 'WOKFMT2009M', >>>>>> + 'P': 'WOKFMT2010M'} >>>>>> for(var i = unitMapping.length - 1; i >= 0; i--) { >>>>>> var mapping = unitMapping[i]; >>>>>> - var suffix = mapping['us']; >>>>>> + var s_key = mapping['us']; >>>>>> + var suffix = i18n[unitmap[s_key]]; >>>>>> var startingValue = mapping['v']; >>>>>> if(number < startingValue) { >>>>>> continue; >>>>>> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl >>>>>> index ca7ae4c..94e90ac 100644 >>>>>> --- a/ui/pages/i18n.json.tmpl >>>>>> +++ b/ui/pages/i18n.json.tmpl >>>>>> @@ -49,5 +49,16 @@ >>>>>> "WOKSETT0009M": "$_("Showing {{ctx.start}} to {{ctx.end}} >>>>>> of {{ctx.total}} entries")", >>>>>> "WOKSETT0010M": "$_("No results found!")", >>>>>> "WOKSETT0011M": "$_("Loading...")", >>>>>> - "WOKSETT0012M": "$_("Actions")" >>>>>> + "WOKSETT0012M": "$_("Actions")", >>>>>> + >>>>>> + "WOKFMT2001M": "$_("Ki")", >>>>>> + "WOKFMT2002M": "$_("Mi")", >>>>>> + "WOKFMT2003M": "$_("Gi")", >>>>>> + "WOKFMT2004M": "$_("Ti")", >>>>>> + "WOKFMT2005M": "$_("Pi")", >>>>>> + "WOKFMT2006M": "$_("k")", >>>>>> + "WOKFMT2007M": "$_("M")", >>>>>> + "WOKFMT2008M": "$_("G")", >>>>>> + "WOKFMT2009M": "$_("T")", >>>>>> + "WOKFMT2010M": "$_("P")" >>>>>> } >>>>> >>>> >>> >>> _______________________________________________ >>> Kimchi-devel mailing list >>> Kimchi-devel(a)ovirt.org >>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >> >> _______________________________________________ >> Kimchi-devel mailing list >> Kimchi-devel(a)ovirt.org >> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >

1 0