jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jalka...@apache.org
Subject svn commit: r649963 - in /incubator/jspwiki/trunk: ./ etc/i18n/ etc/i18n/com/ecyrd/jspwiki/plugin/ src/com/ecyrd/jspwiki/plugin/
Date Sun, 20 Apr 2008 20:05:10 GMT
Author: jalkanen
Date: Sun Apr 20 13:05:05 2008
New Revision: 649963

URL: http://svn.apache.org/viewvc?rev=649963&view=rev
Log:
[JSPWIKI-245] by moving common.xxx -formats into CoreResources, and also moved the PluginResources
to the right places.

Added:
    incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources.properties
      - copied, changed from r649922, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources.properties
    incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_de.properties
      - copied, changed from r649922, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources_de.properties
    incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_es.properties
      - copied, changed from r649922, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources_es.properties
    incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_fi.properties
      - copied, changed from r649922, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources_fi.properties
Removed:
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources.properties
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources_de.properties
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources_es.properties
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources_fi.properties
Modified:
    incubator/jspwiki/trunk/build.xml
    incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
    incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties
    incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties
    incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties
    incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties
    incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties
    incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_nl.properties
    incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_zh_CN.properties

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=649963&r1=649962&r2=649963&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sun Apr 20 13:05:05 2008
@@ -295,7 +295,7 @@
   	       used. FIXME: Figure out a better way to do this in the future. -->
   	  <copy file="${code.i18n}/CoreResources.properties" tofile="${code.i18n}/CoreResources_en.properties"/>
 	  <copy file="${code.i18n}/templates/default.properties" tofile="${code.i18n}/templates/default_en.properties"/>
-	  <copy file="${code.src}/com/ecyrd/jspwiki/plugin/PluginResources.properties" tofile="${code.src}/com/ecyrd/jspwiki/plugin/PluginResources_en.properties"/>
+	  <copy file="${code.i18n}/com/ecyrd/jspwiki/plugin/PluginResources.properties" tofile="${code.i18n}/com/ecyrd/jspwiki/plugin/PluginResources_en.properties"/>
       <jar jarfile="${jarfile}">
          <fileset dir="${code.build}" includes="**/*.class" />
          <fileset dir="${code.src}" includes="com/**/*.properties" />

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources.properties?rev=649963&r1=649962&r2=649963&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources.properties Sun Apr 20 13:05:05 2008
@@ -2,12 +2,24 @@
 #  This is the main i18n resource file for JSPWiki internal
 #  code, the so-called core code.
 #
-# Anrede Du oder Sie? http://lists.wikimedia.org/pipermail/wikide-l/2007-July/019595.html
-#
 # Please, do not forget to use proper HTML entities, so
 #   " = &quot;
 #   ' = &#39;  Note that &apos; is NOT HTML, and does not necessarily work in all
browsers.
 
+
+#
+#  Time/date formatting.  Some plugins might be using some specific formats,
+#  but you are free to use these times and dates.
+#
+
+# Timedate format used when a full time/date is used
+common.datetimeformat = HH:mm:ss dd-MMM-yyyy zzz
+
+# Time stamp format when a simple time stamp is needed (without date)
+common.timeformat = HH:mm:ss
+
+# Date stamp format when showing just the date.
+common.dateformat = EEEE, MMMM d, yyyy
 
 # Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments for workflow
 decision.editWikiApproval=Edit page {2}

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties?rev=649963&r1=649962&r2=649963&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties Sun Apr 20 13:05:05 2008
@@ -14,6 +14,14 @@
 #
 # Translation revised on 2008-02-05 by Florian Holeczek
 
+# Common things
+
+# Date format used across JSPWiki.  Please see "SimpleDateFormat" on information
+# how to handle this
+
+common.datetimeformat = dd.MMM.yyyy, HH:mm:ss zzzz
+common.timeformat = HH:mm:ss
+common.dateformat = EEEE, MMMM d, yyyy
 
 # Decisions
 # {0}=task owner; {1}=requester; {2-9}=additional message arguments for workflow

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties?rev=649963&r1=649962&r2=649963&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties Sun Apr 20 13:05:05 2008
@@ -3,6 +3,16 @@
 #  code, the so-called core code.
 #
 
+# Common things
+
+# Date format used across JSPWiki.  Please see "SimpleDateFormat" on information
+# how to handle this
+
+common.dateformat = dd-MMM-yyyy zzzz HH:mm:ss
+common.timeformat = HH:mm:ss
+common.dateformat = EEEE, MMMM d, yyyy
+
+
 # Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments for workflow
 decision.editWikiApproval=Editar página {2}
 

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties?rev=649963&r1=649962&r2=649963&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties Sun Apr 20 13:05:05 2008
@@ -3,6 +3,16 @@
 #  code, the so-called core code.
 #
 
+# Common things
+
+# Date format used across JSPWiki.  Please see "SimpleDateFormat" on information
+# how to handle this
+
+common.datetimeformat = HH:mm:ss dd-MMM-yyyy zzz
+
+common.dateformat = dd/MM/yyyy
+common.timeformat = HH:mm:ss
+
 # Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments for workflow
 decision.editWikiApproval=Muokkaa sivua {2}
 

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties?rev=649963&r1=649962&r2=649963&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties Sun Apr 20 13:05:05 2008
@@ -6,6 +6,15 @@
 #   " = &quot;
 #   ' = &#39;  Note that &apos; is NOT HTML, and does not necessarily work in all
browsers.
 
+# Common things
+
+# Date format used across JSPWiki.  Please see "SimpleDateFormat" on information
+# how to handle this
+
+common.dateformat = dd.MMM.yyyy, HH:mm:ss zzzz
+common.timeformat = HH:mm:ss
+common.dateformat = EEEE, MMMM d, yyyy
+
 
 # Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments for workflow
 decision.editWikiApproval=Bewerk pagina {2}

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties?rev=649963&r1=649962&r2=649963&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties Sun Apr 20 13:05:05 2008
@@ -8,6 +8,17 @@
 #   " = &quot;
 #   ' = &#39;  Note that &apos; is NOT HTML, and does not necessarily work in all
browsers.
 
+# Common things
+
+# Date format used across JSPWiki.  Please see "SimpleDateFormat" on information
+# how to handle this
+
+# NLS_MESSAGEFORMAT_VAR
+common.dateformat = yyyy-MM-dd HH:mm:ss zzzz
+common.timeformat = HH:mm:ss
+common.dateformat = EEEE, MMMM d, yyyy
+
+
 # Outcomes
 
 # Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments for workflow

Copied: incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources.properties
(from r649922, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources.properties)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources.properties?p2=incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources.properties&p1=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources.properties&r1=649922&r2=649963&rev=649963&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources.properties Sun
Apr 20 13:05:05 2008
@@ -1,13 +1,6 @@
 # This is the English language bundle for JSPWiki core plugins
 # Don&#39;t add your own plugins to this file; create your own bundle, please.
 
-# Common things
-
-# Date format used across JSPWiki.  Please see "SimpleDateFormat" on information
-# how to handle this
-
-common.dateformat = HH:mm:ss dd-MMM-yyyy zzzz
-
 # Errors rendering plugins
 
 plugin.error.insertionfailed = Plugin insertion failed: {0}

Copied: incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_de.properties
(from r649922, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources_de.properties)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_de.properties?p2=incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_de.properties&p1=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources_de.properties&r1=649922&r2=649963&rev=649963&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources_de.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_de.properties
Sun Apr 20 13:05:05 2008
@@ -14,12 +14,7 @@
 #
 # Translation revised on 2008-02-05 by Florian Holeczek
 
-# Common things
 
-# Date format used across JSPWiki.  Please see "SimpleDateFormat" on information
-# how to handle this
-
-common.dateformat = dd.MMM.yyyy, HH:mm:ss zzzz
 
 # Errors rendering plugins
 

Copied: incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_es.properties
(from r649922, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources_es.properties)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_es.properties?p2=incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_es.properties&p1=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources_es.properties&r1=649922&r2=649963&rev=649963&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources_es.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_es.properties
Sun Apr 20 13:05:05 2008
@@ -1,12 +1,6 @@
 # This is the English language bundle for JSPWiki core plugins
 # Don't add your own plugins to this file; create your own bundle, please.
 
-# Common things
-
-# Date format used across JSPWiki.  Please see "SimpleDateFormat" on information
-# how to handle this
-
-common.dateformat = dd-MMM-yyyy zzzz HH:mm:ss
 
 # Errors rendering plugins
 

Copied: incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_fi.properties
(from r649922, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources_fi.properties)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_fi.properties?p2=incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_fi.properties&p1=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources_fi.properties&r1=649922&r2=649963&rev=649963&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginResources_fi.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_fi.properties
Sun Apr 20 13:05:05 2008
@@ -1,13 +1,6 @@
 # This is the English language bundle for JSPWiki core plugins
 # Don't add your own plugins to this file; create your own bundle, please.
 
-# Common things
-
-# Date format used across JSPWiki.  Please see "SimpleDateFormat" on information
-# how to handle this
-
-common.dateformat = HH:mm:ss dd-MMM-yyyy zzzz
-
 # TableOfContents
 tableofcontents.title = Sisällysluettelo
 

Modified: incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_nl.properties?rev=649963&r1=649962&r2=649963&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_nl.properties
(original)
+++ incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_nl.properties
Sun Apr 20 13:05:05 2008
@@ -4,12 +4,6 @@
 #
 # Translation created on 2008-03-16 by Harry Metske
 
-# Common things
-
-# Date format used across JSPWiki.  Please see "SimpleDateFormat" on information
-# how to handle this
-
-common.dateformat = dd.MMM.yyyy, HH:mm:ss zzzz
 
 # Errors rendering plugins
 

Modified: incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_zh_CN.properties?rev=649963&r1=649962&r2=649963&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_zh_CN.properties
(original)
+++ incubator/jspwiki/trunk/etc/i18n/com/ecyrd/jspwiki/plugin/PluginResources_zh_CN.properties
Sun Apr 20 13:05:05 2008
@@ -1,13 +1,6 @@
 # This is the English language bundle for JSPWiki core plugins
 # Don&#39;t add your own plugins to this file; create your own bundle, please.
 
-# Common things
-
-# Date format used across JSPWiki.  Please see "SimpleDateFormat" on information
-# how to handle this
-
-# NLS_MESSAGEFORMAT_VAR
-common.dateformat = yyyy-MM-dd HH:mm:ss zzzz
 
 # Errors rendering plugins
 



Mime
View raw message