[phpwiki-checkins] SF.net SVN: phpwiki:[9493] trunk/lib

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

Revision: 9493
          http://sourceforge.net/p/phpwiki/code/9493
Author:   vargenau
Date:     2015-01-27 10:27:03 +0000 (Tue, 27 Jan 2015)
Log Message:
-----------
Use upper case for ZIP and HTML

Modified Paths:
--------------
    trunk/lib/WikiPluginCached.php
    trunk/lib/main.php
    trunk/lib/ziplib.php

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2015-01-27 10:26:36 UTC (rev 9492)
+++ trunk/lib/WikiPluginCached.php	2015-01-27 10:27:03 UTC (rev 9493)
@@ -840,7 +840,7 @@
         // cache empty, but image maps have to be created _inline_
         // so ask user to reload wiki page instead
         if (($plugin->getPluginType() & PLUGIN_CACHED_MAP) && PLUGIN_CACHED_FORCE_SYNCMAP) {
-            $errortext = _("Image map expired. Reload wiki page to recreate its html part.");
+            $errortext = _("Image map expired. Reload wiki page to recreate its HTML part.");
             $this->printError($errorformat, $errortext);
         }
 

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2015-01-27 10:26:36 UTC (rev 9492)
+++ trunk/lib/main.php	2015-01-27 10:27:03 UTC (rev 9493)
@@ -564,7 +564,7 @@
             $actionDescriptions
                 = array('browse' => _("view this page"),
                 'diff' => _("diff this page"),
-                'dumphtml' => _("dump html pages"),
+                'dumphtml' => _("dump HTML pages"),
                 'dumpserial' => _("dump serial pages"),
                 'edit' => _("edit this page"),
                 'rename' => _("rename this page"),
@@ -575,13 +575,13 @@
                 'purge' => _("purge this page"),
                 'remove' => _("remove this page"),
                 'unlock' => _("unlock this page"),
-                'upload' => _("upload a zip dump"),
+                'upload' => _("upload a ZIP dump"),
                 'verify' => _("verify the current action"),
                 'viewsource' => _("view the source of this page"),
                 'xmlrpc' => _("access this wiki via XML-RPC"),
                 'soap' => _("access this wiki via SOAP"),
-                'zip' => _("download a zip dump from this wiki"),
-                'ziphtml' => _("download a html zip dump from this wiki")
+                'zip' => _("download a ZIP dump from this wiki"),
+                'ziphtml' => _("download a HTML ZIP dump from this wiki")
             );
         }
         if (in_array($action, array_keys($actionDescriptions)))
@@ -608,7 +608,7 @@
             $disallowedActionDescriptions
                 = array('browse' => _("Browsing pages"),
                 'diff' => _("Diffing pages"),
-                'dumphtml' => _("Dumping html pages"),
+                'dumphtml' => _("Dumping HTML pages"),
                 'dumpserial' => _("Dumping serial pages"),
                 'edit' => _("Editing pages"),
                 'revert' => _("Reverting to a previous version of pages"),
@@ -618,13 +618,13 @@
                 'purge' => _("Purging pages"),
                 'remove' => _("Removing pages"),
                 'unlock' => _("Unlocking pages"),
-                'upload' => _("Uploading zip dumps"),
+                'upload' => _("Uploading ZIP dumps"),
                 'verify' => _("Verify the current action"),
                 'viewsource' => _("Viewing the source of pages"),
                 'xmlrpc' => _("XML-RPC access"),
                 'soap' => _("SOAP access"),
-                'zip' => _("Downloading zip dumps"),
-                'ziphtml' => _("Downloading html zip dumps")
+                'zip' => _("Downloading ZIP dumps"),
+                'ziphtml' => _("Downloading HTML ZIP dumps")
             );
         }
         if (in_array($action, array_keys($disallowedActionDescriptions)))

Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php	2015-01-27 10:26:36 UTC (rev 9492)
+++ trunk/lib/ziplib.php	2015-01-27 10:27:03 UTC (rev 9493)
@@ -322,7 +322,7 @@
         if ($zipfile) {
             $this->zipfile = $zipfile;
             if (!($this->fp = fopen($zipfile, "rb"))) {
-                trigger_error(sprintf(_("Can't open zip file “%s” for reading"),
+                trigger_error(sprintf(_("Can't open ZIP file “%s” for reading"),
                     $zipfile), E_USER_ERROR);
             }
         }
@@ -333,11 +333,11 @@
         if ($this->fp) {
             $chunk = fread($this->fp, $nbytes);
             if (strlen($chunk) != $nbytes)
-                trigger_error(_("Unexpected EOF in zip file"), E_USER_ERROR);
+                trigger_error(_("Unexpected EOF in ZIP file"), E_USER_ERROR);
             return $chunk;
         } elseif ($this->buf) {
             if (strlen($this->buf) < $nbytes)
-                trigger_error(_("Unexpected EOF in zip file"), E_USER_ERROR);
+                trigger_error(_("Unexpected EOF in ZIP file"), E_USER_ERROR);
             $chunk = substr($this->buf, 0, $nbytes);
             $this->buf = substr($this->buf, $nbytes);
             return $chunk;

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