language

From alinefm at linux.vnet.ibm.com Fri Jun 13 08:08:00 2014 Content-Type: multipart/mixed; boundary="===============1780299081572941200==" MIME-Version: 1.0 From: Aline Manera To: kimchi-devel at ovirt.org Subject: Re: [Kimchi-devel] [PATCH V9 3/9] Update the i18n tmpl to produce JSON Date: Fri, 13 Jun 2014 09:07:53 -0300 Message-ID: <539AE999.9020703@linux.vnet.ibm.com> In-Reply-To: 1402655334-20164-4-git-send-email-shaohef@linux.vnet.ibm.com --===============1780299081572941200== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable On 06/13/2014 07:28 AM, shaohef(a)linux.vnet.ibm.com wrote: > From: ShaoHe Feng > > Remove html tags from i18n as they are not valid > Correct object definition from acceptable JS to valid JSON replacing > ' with " in attribute names. > > Signed-off-by: Adam King > Signed-off-by: ShaoHe Feng > > Conflicts: > ui/pages/i18n.html.tmpl > --- > ui/pages/i18n.html.tmpl | 179 -----------------------------------------= ------- > ui/pages/i18n.json.tmpl | 166 +++++++++++++++++++++++++++++++++++++++++= +++ In the current ui/pages/Makefile.am we have: dist_html_DATA =3D $(wildcard *.html.tmpl) $(NULL) You need to include *.json.tmpl or replace *.html.tmpl to *.tmpl Otherwise, the i18n.json.tmpl will not be added to the rpm > 2 files changed, 166 insertions(+), 179 deletions(-) > delete mode 100644 ui/pages/i18n.html.tmpl > create mode 100644 ui/pages/i18n.json.tmpl > > diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl > deleted file mode 100644 > index 375a37a..0000000 > --- a/ui/pages/i18n.html.tmpl > +++ /dev/null > @@ -1,179 +0,0 @@ > -#* > - * Project Kimchi > - * > - * Copyright IBM, Corp. 2013 > - * > - * Licensed under the Apache License, Version 2.0 (the "License"); > - * you may not use this file except in compliance with the License. > - * You may obtain a copy of the License at > - * > - * http://www.apache.org/licenses/LICENSE-2.0 > - * > - * Unless required by applicable law or agreed to in writing, software > - * distributed under the License is distributed on an "AS IS" BASIS, > - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or impli= ed. > - * See the License for the specific language governing permissions and > - * limitations under the License. > - *# > -#unicode UTF-8 > -#import gettext > -#from kimchi.cachebust import href > -#silent t =3D gettext.translation($lang.domain, $lang.localedir, languag= es=3D$lang.lang) > -#silent _ =3D t.gettext > -#silent _t =3D t.gettext > - > - > - > - > - > - > - language > - > - > - > - > - > diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl > new file mode 100644 > index 0000000..ce23bc4 > --- /dev/null > +++ b/ui/pages/i18n.json.tmpl > @@ -0,0 +1,166 @@ > +#* > + * Project Kimchi > + * > + * Copyright IBM, Corp. 2013 > + * > + * Licensed under the Apache License, Version 2.0 (the "License"); > + * you may not use this file except in compliance with the License. > + * You may obtain a copy of the License at > + * > + * http://www.apache.org/licenses/LICENSE-2.0 > + * > + * Unless required by applicable law or agreed to in writing, software > + * distributed under the License is distributed on an "AS IS" BASIS, > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or impli= ed. > + * See the License for the specific language governing permissions and > + * limitations under the License. > + *# > +#unicode UTF-8 > +#import gettext > +#from kimchi.cachebust import href > +#silent t =3D gettext.translation($lang.domain, $lang.localedir, languag= es=3D$lang.lang) > +#silent _ =3D t.gettext > +#silent _t =3D t.gettext > +{ > + "KCHAUTH6001E": "$_("The username or password you entered is incorre= ct. Please try again.")", > + "KCHAUTH6002E": "$_("This field is required.")", > + > + "KCHAUTH6001M": "$_("Log in")", > + "KCHAUTH6002M": "$_("Logging in...")", > + > + "Host": "$_("Host")", > + "Guests": "$_("Guests")", > + "Templates": "$_("Templates")", > + "Storage": "$_("Storage")", > + "Network": "$_("Network")", > + > + "KCHAPI6001E": "$_("Invalid URL. Redireced to home page.")", > + "KCHAPI6002E": "$_("Failed to get application configuration")", > + "KCHAPI6003E": "$_("This is not a valid Linux path")", > + "KCHAPI6004E": "$_("This is not a valid URL.")", > + "KCHAPI6005E": "$_("No such data available.")", > + "KCHAPI6006E": "$_("options needed.")", > + "KCHAPI6007E": "$_("Can not contact the host system. Verify the host= system is up and that you have network connectivity to it. HTTP request re= sponse %1. ")", > + > + "KCHAPI6001M": "$_("Delete Confirmation")", > + "KCHAPI6002M": "$_("OK")", > + "KCHAPI6003M": "$_("Cancel")", > + "KCHAPI6004M": "$_("Confirm")", > + "KCHAPI6005M": "$_("Create")", > + "KCHAPI6006M": "$_("Warning")", > + "KCHAPI6007M": "$_("Save")", > + > + "KCHGRD6001M": "$_("Loading...")", > + "KCHGRD6002M": "$_("An error occurs while checking for packages upda= te.")", > + "KCHGRD6003M": "$_("Retry")", > + "KCHGRD6004M": "$_("Detailed message:")", > + > + "KCHTMPL6001W": "$_("No iso found")", > + > + "KCHTMPL6002E": "$_("This is not a valid ISO file.")", > + > + "KCHTMPL6002M": "$_("It will take long time. Do you want to continue= ?")", > + "KCHTMPL6003M": "$_("This will permanently delete the template. Woul= d you like to continue?")", > + > + "KCHHOST6001E": "$_("Unable to shut down system as there are some vi= rtual machines running!")", > + > + "KCHHOST6001M": "$_("Max:")", > + "KCHHOST6002M": "$_("Utilization")", > + "KCHHOST6003M": "$_("Available")", > + "KCHHOST6004M": "$_("Read Rate")", > + "KCHHOST6005M": "$_("Write Rate")", > + "KCHHOST6006M": "$_("Received")", > + "KCHHOST6007M": "$_("Sent")", > + "KCHHOST6008M": "$_("Shutting down or restarting host will cause uns= aved work lost. Continue to shut down/restarting?")", > + > + > + "KCHREPO6001M": "$_("Confirm")", > + "KCHREPO6002M": "$_("Repository will be removed permanently and can'= t be recovered. Do you want to continue?")", > + "KCHREPO6003M": "$_("Repositories")", > + "KCHREPO6004M": "$_("ID")", > + "KCHREPO6005M": "$_("Name")", > + "KCHREPO6006M": "$_("Base URL")", > + "KCHREPO6007M": "$_("Is Mirror")", > + "KCHREPO6008M": "$_("URL Args")", > + "KCHREPO6009M": "$_("Enabled")", > + "KCHREPO6010M": "$_("GPG Check")", > + "KCHREPO6011M": "$_("GPG Key")", > + "KCHREPO6012M": "$_("Add")", > + "KCHREPO6013M": "$_("Edit")", > + "KCHREPO6014M": "$_("Remove")", > + "KCHREPO6015M": "$_("Failed.")", > + "KCHREPO6016M": "$_("Enable")", > + "KCHREPO6017M": "$_("Disable")", > + > + > + "KCHUPD6001M": "$_("Software Updates")", > + "KCHUPD6002M": "$_("Package Name")", > + "KCHUPD6003M": "$_("Version")", > + "KCHUPD6004M": "$_("Architecture")", > + "KCHUPD6005M": "$_("Repository")", > + "KCHUPD6006M": "$_("Update All")", > + "KCHUPD6007M": "$_("Updating...")", > + "KCHUPD6008M": "$_("Failed to retrieve updates.")", > + "KCHUPD6009M": "$_("Failed to update package(s).")", > + > + > + "KCHDR6001M": "$_("Debug report will be removed permanently and can'= t be recovered. Do you want to continue?")", > + "KCHDR6002M": "$_("Debug Reports")", > + "KCHDR6003M": "$_("Name")", > + "KCHDR6005M": "$_("Generated Time")", > + "KCHDR6006M": "$_("Generate")", > + "KCHDR6007M": "$_("Generating...")", > + "KCHDR6008M": "$_("Rename")", > + "KCHDR6009M": "$_("Remove")", > + "KCHDR6010M": "$_("Download")", > + "KCHDR6011M": "$_("Report name should contain only letters, digits a= nd/or hyphen ('-').")", > + "KCHDR6012M": "$_("Pending...")", > + > + "KCHVM6001M": "$_("This will delete the virtual machine and its virt= ual disks. This operation cannot be undone. Would you like to continue?")", > + "KCHVM6002M": "$_("Power off Confirmation")", > + "KCHVM6003M": "$_("This action may produce undesirable results, " > + "for example unflushed disk cache in the guest. " > + "Would you like to continue?")", > + "KCHVM6004M": "$_("Reset Confirmation")", > + "KCHVM6005M": "$_("There is a risk of data loss caused by reset with= out" > + " the guest OS shutdown. Would you like to continu= e?")", > + "KCHVM6006M": "$_("Shut Down Confirmation")", > + "KCHVM6007M": "$_("Note the guest OS may ignore this request. Would = you like to continue?")", > + "KCHVM6008M": "$_("VM Delete Confirmation")", > + > + "KCHVMCD6001M": "$_("This CDROM will be detached permanently and you= can re-attach it. Continue to detach it?")", > + "KCHVMCD6002M": "$_("Attach")", > + "KCHVMCD6003M": "$_("Attaching...")", > + "KCHVMCD6004M": "$_("Replace")", > + "KCHVMCD6005M": "$_("Replacing...")", > + "KCHVMCD6006M": "$_("Successfully attached!")", > + "KCHVMCD6007M": "$_("Successfully replaced!")", > + "KCHVMCD6008M": "$_("Successfully detached!")", > + > + > + "KCHNET6001E": "$_("The VLAN id must be between 1 and 4094.")", > + > + "KCHNET6001M": "$_("unavailable")", > + "KCHNET6002M": "$_("This action will interrupt network connectivity = for any virtual machine that depend on this network.")", > + "KCHNET6003M": "$_("Create a network")", > + "KCHNET6004M": "$_("This network is not persistent. Instead of stop,= this action will permanently delete it. Would you like to continue?")", > + > + "KCHPOOL6001M": "$_("This will permanently delete the storage pool. = Would you like to continue?")", > + "KCHPOOL6002M": "$_("This storage pool is empty.")", > + "KCHPOOL6003M": "$_("It will format your disk and you will loose any= data in there, are you sure to continue? ")", > + "KCHPOOL6004M": "$_("SCSI Fibre Channel")", > + "KCHPOOL6005M": "$_("No SCSI adapters found.")", > + > + "KCHPOOL6001E": "$_("The storage pool name can not be blank.")", > + "KCHPOOL6002E": "$_("The storage pool path can not be blank.")", > + "KCHPOOL6003E": "$_("NFS server mount path can not be blank.")", > + "KCHPOOL6004E": "$_("Invalid storage pool name. It should not contai= n '/'.")", > + "KCHPOOL6005E": "$_("Invalid NFS mount path.")", > + "KCHPOOL6006E": "$_("No logical device selected.")", > + "KCHPOOL6007E": "$_("The iSCSI target can not be blank.")", > + "KCHPOOL6008E": "$_("Server name can not be blank.")", > + "KCHPOOL6009E": "$_("This is not a valid Server Name or IP. please, = modify it.")", > + "KCHPOOL6010M": "$_("Looking for available partitions ...")", > + "KCHPOOL6011M": "$_("No available partitions found.")", > + "KCHPOOL6012M": "$_("This storage pool is not persistent. Instead of= deactivate, this action will permanently delete it. Would you like to cont= inue?")" > +} > \ No newline at end of file --===============1780299081572941200==--