cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [1/4] git commit: updated refs/heads/master to 9ce8a1c
Date Thu, 04 Dec 2014 19:32:12 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 41b871b6b -> 9ce8a1cd0


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ce8a1cd/tools/ngui/static/js/common/dictionary.js
----------------------------------------------------------------------
diff --git a/tools/ngui/static/js/common/dictionary.js b/tools/ngui/static/js/common/dictionary.js
index f540bdb..4b702b2 100644
--- a/tools/ngui/static/js/common/dictionary.js
+++ b/tools/ngui/static/js/common/dictionary.js
@@ -18,50 +18,50 @@
 angular.module('cloudstack').factory("Dictionary", function(){
     var dictionary = {
         labels: {
-            id : 'ID',
-            username : 'Username',
-            account : 'Account',
-            domain : 'Domain',
-            state : 'State',
-            displayname : 'Display Name',
-            instancename : 'Instance Name',
-            zonename : 'Zone Name',
-            type : 'Type',
-            description : 'Description',
-            created : 'Created',
-            name : 'Name',
-            value : 'Value',
-            displaytext : 'Description',
-            networktype : 'Network Type',
-            allocationstate : 'Allocation State',
-            vmdisplayname: 'VM display name',
-            hypervisor : 'Hypervisor',
-            virtualmachine: 'Virtual Machine',
-            virtualmachines: 'Virtual Machines',
-            network: 'Network',
-            networks: 'Networks',
-            instances: 'Instances',
-            event: 'Event',
-            events: 'Events',
-            globalsettings: 'Global Settings',
-            accounts: 'Accounts',
-            domains: 'Domains',
-            storage: 'Storage',
-            configurations: 'Global Settings',
-            serviceofferings: 'Service Offerings',
-            home: 'Home',
-            projects: 'Projects',
-            volumename: 'Volume',
-            intervaltype: 'Interval Type',
-            availabilityZone: 'Availability Zone',
-            diskoffering: 'Disk Offering',
-            format: 'Format',
-            url: 'URL',
-            checksum: 'MD5 Checksum',
-            password: 'Password',
-            email: 'Email',
-            firstname: 'First Name',
-            lastname: 'Last Name',
+            id : 'label.id',
+            username : 'label.username',
+            account : 'label.account',
+            domain : 'label.domain',
+            state : 'label.state',
+            displayname : 'label.display.name',
+            instancename : 'label.instance.name',
+            zonename : 'label.zone.name',
+            type : 'label.type',
+            description : 'label.description',
+            created : 'label.created',
+            name : 'label.name',
+            value : 'label.value',
+            displaytext : 'label.description',
+            networktype : 'label.network.type',
+            allocationstate : 'label.allocation.state',
+            vmdisplayname: 'label.vm.display.name',
+            hypervisor : 'label.hypervisor',
+            virtualmachine: 'label.virtual.machine',
+            virtualmachines: 'label.virtual.machines',
+            network: 'label.menu.network',
+            networks: 'label.networks',
+            instances: 'label.instances',
+            event: 'label.event',
+            events: 'label.menu.events',
+            globalsettings: 'label.menu.global.settings',
+            accounts: 'label.accounts',
+            domains: 'label.menu.domains',
+            storage: 'label.menu.storage',
+            configurations: 'label.menu.global.settings',
+            serviceofferings: 'label.menu.service.offerings',
+            home: 'label.home',
+            projects: 'label.projects',
+            volumename: 'label.volume',
+            intervaltype: 'label.interval.type',
+            availabilityZone: 'label.availability.zone',
+            diskoffering: 'label.disk.offering',
+            format: 'label.format',
+            url: 'label.url',
+            checksum: 'label.md5.checksum',
+            password: 'label.password',
+            email: 'label.email',
+            firstname: 'label.first.name',
+            lastname: 'label.last.name',
         }
     };
     return dictionary;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ce8a1cd/ui/dictionary2.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp
index c61e841..f3164d6 100644
--- a/ui/dictionary2.jsp
+++ b/ui/dictionary2.jsp
@@ -1035,5 +1035,20 @@ $.extend(dictionary, {
 'message.confirm.delete.baremetal.rack.configuration': '<fmt:message key="message.confirm.delete.baremetal.rack.configuration"
/>',
 'message.added.new.nuage.vsp.controller': '<fmt:message key="message.added.new.nuage.vsp.controller"
/>',
 'message.added.vpc.offering': '<fmt:message key="message.added.vpc.offering" />',
+'label.group.by.account': '<fmt:message key="label.group.by.account" />',
+'label.keyboard.language': '<fmt:message key="label.keyboard.language" />',
+'label.standard.us.keyboard': '<fmt:message key="label.standard.us.keyboard" />',
+'label.uk.keyboard': '<fmt:message key="label.uk.keyboard" />',
+'label.japanese.keyboard': '<fmt:message key="label.japanese.keyboard" />',
+'label.simplified.chinese.keyboard': '<fmt:message key="label.simplified.chinese.keyboard"
/>',
+'label.time.colon': '<fmt:message key="label.time.colon" />',
+'label.min.past.the.hr': '<fmt:message key="label.min.past.the.hr" />',
+'label.timezone.colon': '<fmt:message key="label.timezone.colon" />',
+'label.keep.colon': '<fmt:message key="label.keep.colon" />',
+'label.every': '<fmt:message key="label.every" />',
+'label.day': '<fmt:message key="label.day" />',
+'label.of.month': '<fmt:message key="label.of.month" />',
+'label.minutes.past.hour': '<fmt:message key="label.minutes.past.hour" />',
+'label.snapshots': '<fmt:message key="label.snapshots" />',
 });
 </script>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ce8a1cd/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 5ba6301..7dd73bf 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -422,15 +422,15 @@
                                     <!-- Keyboard Language -->
                                     <div class="select odd">
                                         <div class="name">
-                                            <span>Keyboard language</span>
+                                            <span><fmt:message key="label.keyboard.language"
/></span>
                                         </div>
                                         <div class="value">
                                             <select name="keyboardLanguage">
                                                 <option value=""></option>
-                                                <option value="us">Standard (US) keyboard</option>
-                                                <option value="uk">UK keyboard</option>
-                                                <option value="jp">Japanese keyboard</option>
-                                                <option value="sc">Simplified Chinese
keyboard</option>
+                                                <option value="us"><fmt:message
key="label.standard.us.keyboard" /></option>
+                                                <option value="uk"><fmt:message
key="label.uk.keyboard" /></option>
+                                                <option value="jp"><fmt:message
key="label.japanese.keyboard" /></option>
+                                                <option value="sc"><fmt:message
key="label.simplified.chinese.keyboard" /></option>
                                             </select>
                                         </div>
                                     </div>
@@ -1190,7 +1190,7 @@
                     <ul>
                         <li>
                             <div class="icon"><span>1</span></div>
-                            <div class="title">Guest</div>
+                            <div class="title"><fmt:message key="label.guest" /></div>
                             <p>Set up the network for traffic between end-user VMs.</p>
                         </li>
                         <li>
@@ -1470,7 +1470,7 @@
 
             <!-- Recurring Snapshots -->
             <div class="recurring-snapshots">
-                <p class="desc">Description</p>
+                <p class="desc"><fmt:message key="label.description" /></p>
 
                 <div class="schedule">
                     <p>Schedule:</p>
@@ -1493,7 +1493,7 @@
                                     <div class="name"></div>
                                     <div class="value">
                                         <select name="schedule"></select>
-                                        <label for="schedule">minutes(s) past the hour</label>
+                                        <label for="schedule"><fmt:message key="label.minutes.past.hour"
/></label>
                                     </div>
                                 </div>
 
@@ -1508,10 +1508,10 @@
 
                                 <!-- Max snapshots -->
                                 <div class="field maxsnaps">
-                                    <div class="name">Keep</div>
+                                    <div class="name"><fmt:message key="label.keep"
/></div>
                                     <div class="value">
                                         <input type="text" name="maxsnaps" class="required"
/>
-                                        <label for="maxsnaps">snapshot(s)</label>
+                                        <label for="maxsnaps"><fmt:message key="label.snapshots"
/></label>
                                     </div>
                                 </div>
                             </form>
@@ -1524,7 +1524,7 @@
 
                                 <!-- Time -->
                                 <div class="field time">
-                                    <div class="name">Time</div>
+                                    <div class="name"><fmt:message key="label.time"
/></div>
                                     <div class="value">
                                         <select name="time-hour"></select>
                                         <select name="time-minute"></select>
@@ -1534,7 +1534,7 @@
 
                                 <!-- Timezone -->
                                 <div class="field timezone">
-                                    <div class="name">Timezone</div>
+                                    <div class="name"><fmt:message key="label.time.zone"
/></div>
                                     <div class="value">
                                         <select name="timezone"></select>
                                     </div>
@@ -1542,10 +1542,10 @@
 
                                 <!-- Max snapshots -->
                                 <div class="field maxsnaps">
-                                    <div class="name">Keep</div>
+                                    <div class="name"><fmt:message key="label.keep"
/></div>
                                     <div class="value">
                                         <input type="text" name="maxsnaps" class="required"
/>
-                                        <label for="maxsnaps">snapshot(s)</label>
+                                        <label for="maxsnaps"><fmt:message key="label.snapshots"
/></label>
                                     </div>
                                 </div>
                             </form>
@@ -1558,7 +1558,7 @@
 
                                 <!-- Time -->
                                 <div class="field time">
-                                    <div class="name">Time</div>
+                                    <div class="name"><fmt:message key="label.time"
/></div>
                                     <div class="value">
                                         <select name="time-hour"></select>
                                         <select name="time-minute"></select>
@@ -1568,7 +1568,7 @@
 
                                 <!-- Day of week -->
                                 <div class="field day-of-week">
-                                    <div class="name">Day of week</div>
+                                    <div class="name"><fmt:message key="label.day.of.week"
/></div>
                                     <div class="value">
                                         <select name="day-of-week"></select>
                                     </div>
@@ -1576,7 +1576,7 @@
 
                                 <!-- Timezone -->
                                 <div class="field timezone">
-                                    <div class="name">Timezone</div>
+                                    <div class="name"><fmt:message key="label.time.zone"
/></div>
                                     <div class="value">
                                         <select name="timezone"></select>
                                     </div>
@@ -1584,10 +1584,10 @@
 
                                 <!-- Max snapshots -->
                                 <div class="field maxsnaps">
-                                    <div class="name">Keep</div>
+                                    <div class="name"><fmt:message key="label.keep"
/></div>
                                     <div class="value">
                                         <input type="text" name="maxsnaps" class="required"
/>
-                                        <label for="maxsnaps">snapshot(s)</label>
+                                        <label for="maxsnaps"><fmt:message key="label.snapshots"
/></label>
                                     </div>
                                 </div>
                             </form>
@@ -1600,7 +1600,7 @@
 
                                 <!-- Time -->
                                 <div class="field time">
-                                    <div class="name">Time</div>
+                                    <div class="name"><fmt:message key="label.time"
/></div>
                                     <div class="value">
                                         <select name="time-hour"></select>
                                         <select name="time-minute"></select>
@@ -1610,7 +1610,7 @@
 
                                 <!-- Day of week -->
                                 <div class="field day-of-month">
-                                    <div class="name">Day of month</div>
+                                    <div class="name"><fmt:message key="label.day.of.month"
/></div>
                                     <div class="value">
                                         <select name="day-of-month"></select>
                                     </div>
@@ -1618,7 +1618,7 @@
 
                                 <!-- Timezone -->
                                 <div class="field timezone">
-                                    <div class="name">Timezone</div>
+                                    <div class="name"><fmt:message key="label.time.zone"
/></div>
                                     <div class="value">
                                         <select name="timezone"></select>
                                     </div>
@@ -1626,10 +1626,10 @@
 
                                 <!-- Max snapshots -->
                                 <div class="field maxsnaps">
-                                    <div class="name">Keep</div>
+                                    <div class="name"><fmt:message key="label.keep"
/></div>
                                     <div class="value">
                                         <input type="text" name="maxsnaps" class="required"
/>
-                                        <label for="maxsnaps">snapshot(s)</label>
+                                        <label for="maxsnaps"><fmt:message key="label.snapshots"
/></label>
                                     </div>
                                 </div>
                             </form>
@@ -1647,34 +1647,34 @@
                         <tbody>
                             <!-- Hourly -->
                             <tr class="hourly">
-                                <td class="time">Time: <span></span> min
past the hr</td>
+                                <td class="time"><fmt:message key="label.time.colon"
/> <span></span> <fmt:message key="label.min.past.the.hr" /></td>
                                 <td class="day-of-week"><span></span></td>
-                                <td class="timezone">Timezone:<br/><span></span></td>
-                                <td class="keep">Keep: <span></span></td>
+                                <td class="timezone"><fmt:message key="label.timezone.colon"
/><br/><span></span></td>
+                                <td class="keep"><fmt:message key="label.keep.colon"
/> <span></span></td>
                                 <td class="actions"><div class="action destroy"><span
class="icon">&nbsp;</span></div></td>
                             </tr>
                             <!-- Daily -->
                             <tr class="daily">
-                                <td class="time">Time: <span></span></td>
+                                <td class="time"><fmt:message key="label.time.colon"
/> <span></span></td>
                                 <td class="day-of-week"><span></span></td>
-                                <td class="timezone">Timezone:<br/><span></span></td>
-                                <td class="keep">Keep: <span></span></td>
+                                <td class="timezone"><fmt:message key="label.timezone.colon"
/><br/><span></span></td>
+                                <td class="keep"><fmt:message key="label.keep.colon"
/> <span></span></td>
                                 <td class="actions"><div class="action destroy"><span
class="icon">&nbsp;</span></div></td>
                             </tr>
                             <!-- Weekly -->
                             <tr class="weekly">
-                                <td class="time">Time: <span></span></td>
-                                <td class="day-of-week">Every <span></span></td>
-                                <td class="timezone">Timezone:<br/><span></span></td>
-                                <td class="keep">Keep: <span></span></td>
+                                <td class="time"><fmt:message key="label.time.colon"
/> <span></span></td>
+                                <td class="day-of-week"><fmt:message key="label.every"
/> <span></span></td>
+                                <td class="timezone"><fmt:message key="label.timezone.colon"
/><br/><span></span></td>
+                                <td class="keep"><fmt:message key="label.keep.colon"
/> <span></span></td>
                                 <td class="actions"><div class="action destroy"><span
class="icon">&nbsp;</span></div></td>
                             </tr>
                             <!-- Monthly -->
                             <tr class="monthly">
-                                <td class="time">Time: <span></span></td>
-                                <td class="day-of-week">Day <span></span>
of month</td>
-                                <td class="timezone">Timezone:<br/><span></span></td>
-                                <td class="keep">Keep: <span></span></td>
+                                <td class="time"><fmt:message key="label.time.colon"
/> <span></span></td>
+                                <td class="day-of-week"><fmt:message key="label.day"
/> <span></span> <fmt:message key="label.of.month" /></td>
+                                <td class="timezone"><fmt:message key="label.timezone.colon"
/><br/><span></span></td>
+                                <td class="keep"><fmt:message key="label.keep.colon"
/> <span></span></td>
                                 <td class="actions"><div class="action destroy"><span
class="icon">&nbsp;</span></div></td>
                             </tr>
                         </tbody>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ce8a1cd/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 57150c7..0444aaf 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -10098,9 +10098,9 @@
                                     label: 'label.upgrade.required',
                                     converter: function (args) {
                                         if (args > 0) {
-                                            return 'label.yes';
+                                            return _l('label.yes');
                                         } else {
-                                            return 'label.no';
+                                            return _l('label.no');
                                         }
                                     }
                                 }
@@ -10189,9 +10189,9 @@
                                                 label: 'label.upgrade.required',
                                                 converter: function (args) {
                                                     if (args > 0) {
-                                                        return 'label.yes';
+                                                        return _l('label.yes');
                                                     } else {
-                                                        return 'label.no';
+                                                        return _l('label.no');
                                                     }
                                                 }
                                             },                                          
 
@@ -10229,9 +10229,9 @@
                                     label: 'label.upgrade.required',
                                     converter: function (args) {
                                         if (args > 0) {
-                                            return 'label.yes';
+                                            return _l('label.yes');
                                         } else {
-                                            return 'label.no';
+                                            return _l('label.no');
                                         }
                                     }
                                 }
@@ -10320,9 +10320,9 @@
                                                 label: 'label.upgrade.required',
                                                 converter: function (args) {
                                                     if (args > 0) {
-                                                        return 'label.yes';
+                                                        return _l('label.yes');
                                                     } else {
-                                                        return 'label.no';
+                                                        return _l('label.no');
                                                     }
                                                 }
                                             },
@@ -10363,9 +10363,9 @@
                                     label: 'label.upgrade.required',
                                     converter: function (args) {
                                         if (args > 0) {
-                                            return 'label.yes';
+                                            return _l('label.yes');
                                         } else {
-                                            return 'label.no';
+                                            return _l('label.no');
                                         }
                                     }
                                 }
@@ -10454,14 +10454,14 @@
                                                 label: 'label.upgrade.required',
                                                 converter: function (args) {
                                                     if (args > 0) {
-                                                        return 'label.yes';
+                                                        return _l('label.yes');
                                                     } else {
-                                                        return 'label.no';
+                                                        return _l('label.no');
                                                     }
                                                 }
                                             },
                                             numberOfRouterRequiresUpgrade: {
-                                            	label: 'label.total.virtual.routers that require
upgrade'
+                                            	label: 'label.total.virtual.routers.upgrade'
                                             },
                                             podname: {
                                                 label: 'label.pod'
@@ -10485,7 +10485,7 @@
                     routerGroupByAccount: {
                         id: 'routerGroupByAccount',
                         type: 'select',
-                        title: 'group by account',
+                        title: 'label.group.by.account',
                         listView: {
                             id: 'routerGroupByAccount',
                             label: 'label.virtual.appliances',
@@ -10503,9 +10503,9 @@
                                     label: 'label.upgrade.required',
                                     converter: function (args) {
                                         if (args > 0) {
-                                            return 'label.yes';
+                                            return _l('label.yes');
                                         } else {
-                                            return 'label.no';
+                                            return _l('label.no');
                                         }
                                     }
                                 }
@@ -10659,14 +10659,14 @@
                                                 label: 'label.upgrade.required',
                                                 converter: function (args) {
                                                     if (args > 0) {
-                                                        return 'label.yes';
+                                                        return _l('label.yes');
                                                     } else {
-                                                        return 'label.no';
+                                                        return _l('label.no');
                                                     }
                                                 }
                                             },                                          
 
                                             numberOfRouterRequiresUpgrade: {
-                                            	label: 'label.total.virtual.routers that require
upgrade'
+                                            	label: 'label.total.virtual.routers.upgrade'
                                             }
                                         }],
                                         dataProvider: function (args) {


Mime
View raw message