openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-1065242 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1065242 in OpenLP: "Webinterface buttons are not translatable"
  https://bugs.launchpad.net/openlp/+bug/1065242

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-1065242/+merge/129060

Fixed bug #1065242
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-1065242/+merge/129060
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-1065242 into lp:openlp.

=== modified file 'openlp/plugins/remotes/html/index.html'
--- openlp/plugins/remotes/html/index.html	2012-06-22 14:14:53 +0000
+++ openlp/plugins/remotes/html/index.html	2012-10-10 22:12:22 +0000
@@ -66,10 +66,10 @@
     <a href="#" id="service-refresh" data-role="button" data-icon="refresh">${refresh}</a>
     <div data-role="navbar">
       <ul>
-        <li><a href="#service-manager" data-theme="e">Service</a></li>
-        <li><a href="#slide-controller">Slides</a></li>
-        <li><a href="#alerts">Alerts</a></li>
-        <li><a href="#search">Search</a></li>
+        <li><a href="#service-manager" data-theme="e">${service}</a></li>
+        <li><a href="#slide-controller">${slides}</a></li>
+        <li><a href="#alerts">${alerts}</a></li>
+        <li><a href="#search">${search}</a></li>
       </ul>
     </div>
   </div>
@@ -97,10 +97,10 @@
     <a href="#" id="controller-refresh" data-role="button" data-icon="refresh">${refresh}</a>
     <div data-role="navbar">
       <ul>
-        <li><a href="#service-manager">Service</a></li>
-        <li><a href="#slide-controller" data-theme="e">Slides</a></li>
-        <li><a href="#alerts">Alerts</a></li>
-        <li><a href="#search">Search</a></li>
+        <li><a href="#service-manager">${service}</a></li>
+        <li><a href="#slide-controller" data-theme="e">${slides}</a></li>
+        <li><a href="#alerts">${alerts}</a></li>
+        <li><a href="#search">${search}</a></li>
       </ul>
     </div>
   </div>
@@ -127,10 +127,10 @@
     <h1>${alerts}</h1>
     <div data-role="navbar">
       <ul>
-        <li><a href="#service-manager">Service</a></li>
-        <li><a href="#slide-controller">Slides</a></li>
-        <li><a href="#alerts" data-theme="e">Alerts</a></li>
-        <li><a href="#search">Search</a></li>
+        <li><a href="#service-manager">${service}</a></li>
+        <li><a href="#slide-controller">${slides}</a></li>
+        <li><a href="#alerts" data-theme="e">${alerts}</a></li>
+        <li><a href="#search">${search}</a></li>
       </ul>
     </div>
   </div>
@@ -148,10 +148,10 @@
     <h1>${search}</h1>
     <div data-role="navbar">
       <ul>
-        <li><a href="#service-manager">Service</a></li>
-        <li><a href="#slide-controller">Slides</a></li>
-        <li><a href="#alerts">Alerts</a></li>
-        <li><a href="#search" data-theme="e">Search</a></li>
+        <li><a href="#service-manager">${service}</a></li>
+        <li><a href="#slide-controller">${slides}</a></li>
+        <li><a href="#alerts">${alerts}</a></li>
+        <li><a href="#search" data-theme="e">${search}</a></li>
       </ul>
     </div>
   </div>

=== modified file 'openlp/plugins/remotes/lib/httpserver.py'
--- openlp/plugins/remotes/lib/httpserver.py	2012-06-22 14:14:53 +0000
+++ openlp/plugins/remotes/lib/httpserver.py	2012-10-10 22:12:22 +0000
@@ -308,7 +308,9 @@
             'add_and_go_to_service': translate('RemotePlugin.Mobile',
                 'Add &amp; Go to Service'),
             'no_results': translate('RemotePlugin.Mobile', 'No Results'),
-            'options': translate('RemotePlugin.Mobile', 'Options')
+            'options': translate('RemotePlugin.Mobile', 'Options'),
+            'service': translate('RemotePlugin.Mobile', 'Service'),
+            'slides': translate('RemotePlugin.Mobile', 'Slides')
         }
 
     def ready_read(self):