[xwiki-notifications] r5468 - in xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources: WikiManager WikiResources

[SVN]

Author: tmortagne
Date: 2007-10-23 19:03:55 +0200 (Tue, 23 Oct 2007)
New Revision: 5468

Modified:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
Log:
* Use #info and #error macros in WikiManager.CreateNewWiki.
* Improve sub wiki web path printing using XWikiServer.getHomePageUrl() when 
successfully create a new wiki.

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki
   2007-10-23 16:49:51 UTC (rev 5467)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki
   2007-10-23 17:03:55 UTC (rev 5468)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1186669764000</creationDate>
-<date>1192542613000</date>
-<contentUpdateDate>1192542613000</contentUpdateDate>
-<version>1.7</version>
+<date>1193157363000</date>
+<contentUpdateDate>1193157363000</contentUpdateDate>
+<version>1.3</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -81,17 +81,13 @@
   #set($result = $wikimanager.createNewWiki($wikiname, $wikitemplate, 
$wikipackage, $wikidocument, true))
 
   #if ($result == $Exception.ERROR_NOERROR)
-    &lt;font color=green&gt;
-      $msg.get("wikimanager.successcreatewiki", [$wikiname, 
$wikidocument.server])
-    &lt;/font&gt;
+    #info($msg.get("wikimanager.successcreatewiki", [$wikiname, 
$wikidocument.getHomePageUrl()]))
   #else
-    &lt;font color=red&gt;
-      #if ($result == $Exception.ERROR_WM_WIKIALREADYEXISTS)
-        $msg.get("wikimanager.errorcreatewiki.ERROR_WM_WIKIALREADYEXISTS", 
[$wikiname, $result])
-      #else
-        $msg.get("wikimanager.errorcreatewiki", [$wikiname, $result])
-      #end
-    &lt;/font&gt;
+    #if ($result == $Exception.ERROR_WM_WIKIALREADYEXISTS)
+      
#error($msg.get("wikimanager.errorcreatewiki.ERROR_WM_WIKIALREADYEXISTS", 
[$wikiname, $result]))
+    #else
+      #error($msg.get("wikimanager.errorcreatewiki", [$wikiname, $result]))
+    #end
   #end
 #end
 

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
  2007-10-23 16:49:51 UTC (rev 5467)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
  2007-10-23 17:03:55 UTC (rev 5468)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1186671807000</creationDate>
-<date>1192541312000</date>
-<contentUpdateDate>1192541312000</contentUpdateDate>
-<version>1.24</version>
+<date>1193157236000</date>
+<contentUpdateDate>1193157236000</contentUpdateDate>
+<version>1.2</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -112,7 +112,7 @@
 wikimanager.errordeletewiki=Wiki \"{0}\" delete failed with error code \"{1}\".
 wikimanager.successsetvisibility=Wiki \"{0}\" visibility changed to \"{1}\".
 wikimanager.errorsetvisibility=Wiki \"{0}' visibility changing failed with 
error code \"{1}\".
-wikimanager.successcreatewiki=Your wiki \"{0}\" has been created. You can 
access it at the following address: http://{1}.
+wikimanager.successcreatewiki=Your wiki \"{0}\" has been created. You can 
access it at the following address: {1}.
 wikimanager.errorcreatewiki=Wiki \"{0}\" creation failed with error code 
\"{1}\".
 wikimanager.errorcreatewiki.ERROR_WM_WIKIALREADYEXISTS=This wiki \"{0}\" 
already exist. Please choose another name.
 wikimanager.listwikiempty=There are no open wikis.

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications