Changeset 134

Timestamp:

08/30/07 00:15:40 (17 months ago)

Author:

chris

Message:

Updated javascript to take advantage of localisations.

Location:

trunk

Files:

• js/hellaworld.php (moved) (moved from trunk/js/hellaworld.js) (6 diffs)
• locale/en_GB.UTF-8/LC_MESSAGES/messages.po (modified) (1 diff)
• locale/en_US.UTF-8/LC_MESSAGES/messages.po (modified) (1 diff)
• locale/sv_SE.UTF-8/LC_MESSAGES/messages.po (modified) (1 diff)
• templates/default.php (modified) (1 diff)

trunk/js/hellaworld.php

@@ +1 @@
+<?php   
+
         // $Id$
+        include '../config.php';
+
+        if (!function_exists('_')) {
+                function _($string) {
+                        return $string;
+                }
+        } else {
+                putenv('LC_ALL=' . $config['language'] . '.UTF-8');
+                setlocale(LC_ALL, $config['language'] . '.UTF-8');
+                bindtextdomain('messages', '../locale');
+                textdomain('messages');
+        }
+
+?>
 
         var refresh = false;
@@ -41 +57 @@
                                         },
                                         error : function() {
-                                                alert('Apologies, there was an error while making the request');
+                                                alert('<?php echo _('Apologies, there was an error while making the request'); ?>');
                                         }
                                 });
@@ -58 +74 @@
 
         function updateData(json) {
-                var info = "<h2>Currently Downloading</h2>";
+                var info = "<h2><?php echo _('Currently Downloading'); ?></h2>";
                 if (json.downloading != null) {
                         info += "<div>" + json.downloading + "</div>";
-                        info += '<div class="queuestats"><img alt="progress bar" src="progress.php?percentage=' + json.completed + '"/> ' + json.completed + '% complete</div>';
-                        info += '<div class="queuestats">' + json.remaining + 'MB of ' + json.size + 'MB remaining</div>';
+                        info += '<div class="queuestats"><img alt="progress bar" src="progress.php?percentage=' + json.completed + '"/> <?php printf(_('%s%% complete'), "' + json.completed + '"); ?></div>';
+                        info += '<div class="queuestats"><?php printf(_('%sMB of %sMB remaining'), "' + json.remaining + '", "' + json.size + '"); ?></div>';
                         info += '<div class="queuestats" style="margin-bottom: 5px;">';
                         if (json.paused) {
-                                info += 'PAUSED';
+                                info += '<?php echo _('PAUSED'); ?>';
                         } else {
-                                info += 'ETA ' + json.eta + ' at ' + json.transferRate + 'KB/s';
+                                info += '<?php printf(_('ETA %s at %sKB/s'), "' + json.eta + '", "' + json.transferRate + '"); ?>';
                         }
                         info += '</div>'
                 } else {
-                        info += '<div style="margin-bottom: 5px;">Nothing</div>';
-                }
-                info += '<h2>Currently Processing</h2>';
+                        info += '<div style="margin-bottom: 5px;"><?php echo _('Nothing'); ?></div>';
+                }
+                info += '<h2><?php echo _('Currently Processing'); ?></h2>';
                 if (json.processing != null) {
                         info += '<div>' + json.processing + '</div>';
                 } else {
-                        info += '<div>Nothing</div>';
+                        info += '<div><?php echo _('Nothing'); ?></div>';
                 }
                 $('#info').html(info);
@@ -86 +102 @@
                                 queue += '<div class="orderform"><input type="text" name="order[]" onchange="stopRefresher();" value="' + json.queue[i].index + '" /></div>';
                                 queue += '<div class="queuetitle">' + json.queue[i].nzbName + '</div>';
-                                queue += '<ul class="queuecontrols"><li class="handle">Drag me</li><li class="control"><a href="index.php?info=' + json.queue[i].index + '&KeepThis=true&TB_iframe=true&height=200&width=500" class="thickbox"><img src="images/information.png" alt="Info" /></a></li><li class="control"><a title="Cancel" href="' + json.path + '?action=1&amp;id=' + json.queue[i].id + '"><img src="images/delete.png" alt="Cancel" /></a></li><li class="control"><a title="Up" href="' + json.path + '?action=2&amp;id=' + json.queue[i].id + '"><img src="images/up.png" alt="Up" /></a></li><li class="control"><a title="Down" href="' + json.path + '?action=3&amp;id=' + json.queue[i].id + '"><img src="images/down.png" alt="Down" /></a></li><li class="control"><a title="Top" href="' + json.path + '?action=4&amp;id=' + json.queue[i].id + '"><img src="images/top.png" alt="Top" /></a></li><li class="control"><a title="Bottom" href="' + json.path + '?action=5&amp;id=' + json.queue[i].id + '"><img src="images/bottom.png" alt="Bottom" /></a></li><li class="control"><a title="Force" href="' + json.path + '?action=6&amp;id=' + json.queue[i].id + '"><img src="images/force.png" alt="Force" /></a></li></ul>';
-                                queue += '<div class="queuestats">' + json.queue[i].totalmb + 'MB';
+                                queue += '<ul class="queuecontrols"><li class="handle"><?php echo _('Drag me'); ?></li><li class="control"><a href="index.php?info=' + json.queue[i].index + '&KeepThis=true&TB_iframe=true&height=200&width=500" class="thickbox"><img src="images/information.png" alt="Info" /></a></li><li class="control"><a title="Cancel" href="' + json.path + '?action=1&amp;id=' + json.queue[i].id + '"><img src="images/delete.png" alt="Cancel" /></a></li><li class="control"><a title="Up" href="' + json.path + '?action=2&amp;id=' + json.queue[i].id + '"><img src="images/up.png" alt="Up" /></a></li><li class="control"><a title="Down" href="' + json.path + '?action=3&amp;id=' + json.queue[i].id + '"><img src="images/down.png" alt="Down" /></a></li><li class="control"><a title="Top" href="' + json.path + '?action=4&amp;id=' + json.queue[i].id + '"><img src="images/top.png" alt="Top" /></a></li><li class="control"><a title="Bottom" href="' + json.path + '?action=5&amp;id=' + json.queue[i].id + '"><img src="images/bottom.png" alt="Bottom" /></a></li><li class="control"><a title="Force" href="' + json.path + '?action=6&amp;id=' + json.queue[i].id + '"><img src="images/force.png" alt="Force" /></a></li></ul>';
+                                queue += '<div class="queuestats"><?php printf(_('%sMB'), "' + json.queue[i].totalmb + '"); ?>';
                                 if (json.transferRate > 0) {
-                                        queue += ' ETA: ' + json.queue[i].eta + '</div>';
+                                        queue += '<?php printf(_(' ETA: %s'), "' + json.queue[i].eta + '"); ?></div>';
                                 } else {
                                         queue += '</div>';
@@ -103 +119 @@
                                 finished += '<li class="queuebox ' + json.finished[i].type + '">';
                                 finished += '<div class="queuetitle">' + json.finished[i].archiveName + '</div>';
-                                finished += '<ul class="queuecontrols"><li class="control"><a href="index.php?removefinished=' + json.finished[i].index + '">Remove</a></li></ul>';
-                                finished += '<div class="queuestats">Finished on: ' + json.finished[i].finishedTime + ' Processing Time: ' + json.finished[i].elapsedTime;
+                                finished += '<ul class="queuecontrols"><li class="control"><a href="index.php?removefinished=' + json.finished[i].index + '"><?php echo _('Remove'); ?></a></li></ul>';
+                                finished += '<div class="queuestats"><?php printf(_('Finished on: %s Processing Time: %s'), "' + json.finished[i].finishedTime + '", "' + json.finished[i].elapsedTime"); ?>;
                                 if (json.finished[i].parMessage != '') {
-                                        finished += ' Par message: ' + json.finished[i].parMessage;
+                                        finished += '<?php printf(_(' Par message: %s'), "' + json.finished[i].parMessage"); ?>;
                                 }
                                 finished += '</div></li>';
@@ -139 +155 @@
                 var sorttype = obj.sorttype.options[obj.sorttype.selectedIndex].value;
                 if (sorttype > 1) {
-                        return confirm('This will reorder the entire queue, continue?');
+                        return confirm('<?php echo _('This will reorder the entire queue, continue?'); ?>');
                 } else {
                         return true;

trunk/locale/en_GB.UTF-8/LC_MESSAGES/messages.po

@@ -207 +207 @@
 #, php-format
 # The preceeding space is required.
-msgid " Par message: "
+msgid " Par message: %s"
 msgstr ""
 

trunk/locale/en_US.UTF-8/LC_MESSAGES/messages.po

@@ -207 +207 @@
 #, php-format
 # The preceeding space is required.
-msgid " Par message: "
+msgid " Par message: %s"
 msgstr ""
 

trunk/locale/sv_SE.UTF-8/LC_MESSAGES/messages.po

@@ -208 +208 @@
 #, php-format
 # The preceeding space is required.
-msgid " Par message: "
+msgid " Par message: %s"
 msgstr " Par Meddelande: %s"
 

trunk/templates/default.php

@@ -54 +54 @@
                 <script src="js/interface.js" type="text/javascript"></script>
                 <script src="js/tabs.js" type="text/javascript"></script>
-                <script src="js/hellaworld.js" type="text/javascript"></script>
+                <script src="js/hellaworld.php" type="text/javascript"></script>
         </head>
         <body onload="init();">