Merge remote-tracking branch 'origin/Release02x01'

foswiki · Nov 22, 2016 · 845be81 · 845be81
2 parents f635056 + 3cb365a
commit 845be81
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/I18N.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/I18N.pm
@@ -28,7 +28,7 @@ sub new {
     my $this = bless(
         $class->SUPER::new(
             name         => 'I18N',
-            version      => '1.0',
+            version      => '1.1',
             author       => 'Michael Daum',
             homepage     => 'https://foswiki.org/Extensions/JQueryPlugin',
             javascript   => ['i18n.js'],

diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/i18n/i18n.uncompressed.js b/JQueryPlugin/pub/System/JQueryPlugin/plugins/i18n/i18n.uncompressed.js
@@ -41,7 +41,7 @@
     });
 
     // dynamically translate all i18n elements 
-    $(".i18n").livequery(function() {
+    $(".i18n:not(.i18nTranslated)").livequery(function() {
       self.translateElement(this);
     });
 
@@ -95,7 +95,7 @@
   I18N.prototype.translateAllElements = function() {
     var self = this;
 
-    $(".i18n").each(function() {
+    $(".i18n:not(.i18nTranslated)").each(function() {
       self.translateElement(this);
     });
   };
@@ -106,18 +106,29 @@
         $elem = $(elem),
         data = $elem.data(),
         message = data.i18nMessage,
+        translation,
         params = {};
 
-      $.each(data, function(key, val) {
-        if (key.match(/^i18n(.*)$/) && key !== 'i18nMessage') {
-          key = RegExp.$1.toLowerCase();
-          params[key] = val;
-        }
-      });
+    $.each(data, function(key, val) {
+      if (key.match(/^i18n(.*)$/) && key !== 'i18nMessage') {
+        key = RegExp.$1.toLowerCase();
+        params[key] = val;
+      }
+    });
 
-      if (typeof(message) !== 'undefined') {
-        $elem.html(self.translate(message, params));
+    if (typeof(message) === 'undefined') {
+      message = $elem.text();
+    }
+    if (typeof(message) !== 'undefined') {
+      translation = self.translate(message, params);
+      if (translation !== message) {
+        $elem.html(translation).addClass("i18nTranslated");
+
+        //console.log("translating ",message,"to",translation);
       }
+    }
+
+    return $elem;
   };
 
   // translate a string

diff --git a/core/tools/branches b/core/tools/branches
@@ -30,12 +30,15 @@ sub descr {
 
 sub summary {
     my $it = shift;
+    my $br = shift;
+    ($br) = $br =~ m/(Item\d+)/;
 
     #print "SUMMARY for @_\n";
     return $items{$it} if $items{$it};
     my $url = "http://foswiki.org/Tasks/ItemSummaryQuery?item=$it;skin=text";
     my $description = get $url;
     $description =~ s#<b>.*</b>\n##;
+    $description =~ s#^$br:## if $br;
     $items{$it} = $description;
     return $description;
 }
@@ -88,10 +91,10 @@ for my $branch (@branches) {
     my $desc = descr $branch;
     print indent $desc. "\n" if $desc;
     if ( $branch =~ m/(Item(?:[0-9]){3,5})/ ) {
-        print indent summary $1;
+        print indent summary( $1, $branch );
     }
     elsif ( $desc =~ m/(Item(?:[0-9]){3,5})/ ) {
-        print indent summary $1;
+        print indent summary( $1, $branch );
     }
 
     print "\n";