phpwiki-checkins

[phpwiki-checkins] SF.net SVN: phpwiki:[7043] trunk/lib/diff.php

[<var...@us...>]

Revision: 7043
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7043&view=rev
Author:   vargenau
Date:     2009-07-16 12:58:22 +0000 (Thu, 16 Jul 2009)

Log Message:
-----------
Fix bug #1889583 Diff display is incomplete

Modified Paths:
--------------
    trunk/lib/diff.php

Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2009-07-16 08:51:13 UTC (rev 7042)
+++ trunk/lib/diff.php	2009-07-16 12:58:22 UTC (rev 7043)
@@ -45,7 +45,7 @@
 
         foreach ($words as $word) {
             // new-line should only come as first char of word.
-            if (!$word)
+            if ($word === "") 
                 continue;
             if ($word[0] == "\n") {
                 $this->_group .= " ";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7939] trunk/lib/diff.php

[<var...@us...>]

Revision: 7939
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7939&view=rev
Author:   vargenau
Date:     2011-03-01 09:32:52 +0000 (Tue, 01 Mar 2011)

Log Message:
-----------
Better translation mechanism

Modified Paths:
--------------
    trunk/lib/diff.php

Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2011-02-04 16:35:28 UTC (rev 7938)
+++ trunk/lib/diff.php	2011-03-01 09:32:52 UTC (rev 7939)
@@ -44,7 +44,7 @@
 
         foreach ($words as $word) {
             // new-line should only come as first char of word.
-            if ($word === "") 
+            if ($word === "")
                 continue;
             if ($word[0] == "\n") {
                 $this->_group .= " ";
@@ -220,13 +220,13 @@
         $version = $request->getArg('version');
         $previous = $request->getArg('previous');
     }
- 
+
     // abort if page doesn't exist
     $dbi = $request->getDbh();
     $page = $request->getPage();
     $current = $page->getCurrentRevision(false);
     if ($current->getVersion() < 1) {
-	$html = HTML::div(array('class'=>'wikitext','id'=>'difftext'),
+        $html = HTML::div(array('class'=>'wikitext','id'=>'difftext'),
                           HTML::p(fmt("I'm sorry, there is no such page as %s.",
                                       WikiLink($pagename, 'unknown'))));
         require_once('lib/Template.php');
@@ -317,14 +317,16 @@
 
         if ($diff->isEmpty()) {
             $html->pushContent(HTML::hr(),
-                               HTML::p(_("Content of versions "), $old->getVersion(),
-                                       _(" and "), $new->getVersion(), _(" is identical.")));
+                               HTML::p(sprintf(_("Content of versions %1$s and %2$s is identical."),
+                                               $old->getVersion(),
+                                               $new->getVersion())));
             // If two consecutive versions have the same content, it is because the page was
             // renamed, or metadata changed: ACL, owner, markup.
             // We give the reason by printing the summary.
             if (($new->getVersion() - $old->getVersion()) == 1) {
-                $html->pushContent(HTML::p(_("Version "), $new->getVersion(), 
-                                           _(" was created because: "), $new->get('summary')));
+                $html->pushContent(HTML::p(sprintf(_("Version %1$s was created because: %2$s"),
+                                                   $new->getVersion(),
+                                                   $new->get('summary'))));
             }
         } else {
             $fmt = new HtmlUnifiedDiffFormatter;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8085] trunk/lib/diff.php

[<var...@us...>]

Revision: 8085
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8085&view=rev
Author:   vargenau
Date:     2011-05-20 10:53:54 +0000 (Fri, 20 May 2011)

Log Message:
-----------
Must use single quote for string because of $ in "%1$s"

Modified Paths:
--------------
    trunk/lib/diff.php

Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2011-05-20 10:40:59 UTC (rev 8084)
+++ trunk/lib/diff.php	2011-05-20 10:53:54 UTC (rev 8085)
@@ -317,14 +317,14 @@
 
         if ($diff->isEmpty()) {
             $html->pushContent(HTML::hr(),
-                               HTML::p(sprintf(_("Content of versions %1$s and %2$s is identical."),
+                               HTML::p(sprintf(_('Content of versions %1$s and %2$s is identical.'),
                                                $old->getVersion(),
                                                $new->getVersion())));
             // If two consecutive versions have the same content, it is because the page was
             // renamed, or metadata changed: ACL, owner, markup.
             // We give the reason by printing the summary.
             if (($new->getVersion() - $old->getVersion()) == 1) {
-                $html->pushContent(HTML::p(sprintf(_("Version %1$s was created because: %2$s"),
+                $html->pushContent(HTML::p(sprintf(_('Version %1$s was created because: %2$s'),
                                                    $new->getVersion(),
                                                    $new->get('summary'))));
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.