You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2018/07/01 22:14:08 UTC
[jspwiki] branch master updated (aacdfe2 -> 86587fd)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git.
from aacdfe2 2.10.5-git-05 : haddock update on INFO nav menu and localstorage cache
new 741505b ensure CommentedPropertiesTest runs ok whatever the EOL of test.properties
new 5ef87a3 fix a couple of warnings on CommentedProperties
new 86587fd add new i18n resources from 2.10.5-git-05 (no version bump)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/wiki/util/CommentedProperties.java | 4 ++--
jspwiki-war/src/main/resources/templates/default_es.properties | 10 ++++++++--
.../java/org/apache/wiki/util/CommentedPropertiesTest.java | 6 ++++--
3 files changed, 14 insertions(+), 6 deletions(-)
[jspwiki] 02/03: fix a couple of warnings on CommentedProperties
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 5ef87a3508fb026291f901b7b3edaf3fc466f60e
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Jul 2 00:12:40 2018 +0200
fix a couple of warnings on CommentedProperties
---
.../src/main/java/org/apache/wiki/util/CommentedProperties.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/util/CommentedProperties.java b/jspwiki-war/src/main/java/org/apache/wiki/util/CommentedProperties.java
index 5b312c9..d23a7e7 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/util/CommentedProperties.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/util/CommentedProperties.java
@@ -127,9 +127,9 @@ public class CommentedProperties extends Properties
public synchronized void putAll( Map arg0 )
{
// Shove all of the entries into the property string
- for( Iterator it = arg0.entrySet().iterator(); it.hasNext(); )
+ for( Iterator< Entry< ?, ? > > it = arg0.entrySet().iterator(); it.hasNext(); )
{
- Entry entry = (Entry)it.next();
+ Entry< ?, ? > entry = it.next();
writeProperty( entry.getKey(), entry.getValue() );
}
[jspwiki] 01/03: ensure CommentedPropertiesTest runs ok whatever
the EOL of test.properties
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 741505b3c7d8c68a89cc250241e59aa89b719da2
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Jul 2 00:11:50 2018 +0200
ensure CommentedPropertiesTest runs ok whatever the EOL of test.properties
---
.../src/test/java/org/apache/wiki/util/CommentedPropertiesTest.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/jspwiki-war/src/test/java/org/apache/wiki/util/CommentedPropertiesTest.java b/jspwiki-war/src/test/java/org/apache/wiki/util/CommentedPropertiesTest.java
index 9fabde4..f440818 100644
--- a/jspwiki-war/src/test/java/org/apache/wiki/util/CommentedPropertiesTest.java
+++ b/jspwiki-war/src/test/java/org/apache/wiki/util/CommentedPropertiesTest.java
@@ -46,8 +46,10 @@ public class CommentedPropertiesTest
{
InputStream in = CommentedPropertiesTest.class.getClassLoader().getResourceAsStream( "test.properties" );
m_props.load( in );
- File m_propFile = getFile( "test.properties" );
- m_propFileSize = ( int )m_propFile.length();
+ // CommentedProperties always internally uses \n as EOL, as opposed to a File which uses, well, the given EOL of the File.
+ // Thus, executing this test when test.properties has another EOL (like f.ex when git cloning having core.autocrlf=true on
+ // windows) using File.length() would fail this test.
+ m_propFileSize = m_props.toString().length();
in.close();
}
[jspwiki] 03/03: add new i18n resources from 2.10.5-git-05 (no
version bump)
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 86587fd0d490d111f77a8263230dcb521830638c
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Jul 2 00:13:30 2018 +0200
add new i18n resources from 2.10.5-git-05 (no version bump)
---
jspwiki-war/src/main/resources/templates/default_es.properties | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/jspwiki-war/src/main/resources/templates/default_es.properties b/jspwiki-war/src/main/resources/templates/default_es.properties
index 615ac6b..17b29e7 100644
--- a/jspwiki-war/src/main/resources/templates/default_es.properties
+++ b/jspwiki-war/src/main/resources/templates/default_es.properties
@@ -309,6 +309,9 @@ actions.index.title=Listado alfab
actions.recentchanges=Cambios Recientes
actions.recentchanges.title=P�ginas ordenadas por fecha de modificaci�n
+
+actions.trail=Rastro
+
actions.more=M�s...
actions.separator= - - - - - -
actions.comment=A�adir Comentario
@@ -525,6 +528,9 @@ editor.plain.preview.title=Vista preliminar [ v ]
editor.plain.cancel.submit=Cancelar
editor.plain.cancel.title=Cancelar la edici�n. Tus cambios se perder�n. [ q ]
+editor.plain.localstorage.restore=�Restaurar �ltimos cambios sin guardar!
+editor.plain.localstorage.delete=Borrar
+
editor.plain.changenote=Nota de Cambio
editor.commentsignature=Firma del comentario
editor.plain.toolbar=Barra de herramientas
@@ -543,8 +549,8 @@ editor.plain.undo.title=Deshacer
editor.plain.posteditor=Introduce Palabra clave+Tab:
editor.plain.posteditor.title=shift+enter para el siguiente campo
-editor.plain.smartpairs= Emparejamiento inteligente de bloques
-editor.plain.smartpairs.title= Auto emparejamiento de () [] {} <> "" ''
+editor.plain.smartpairs=Emparejamiento inteligente de bloques
+editor.plain.smartpairs.title=Auto emparejamiento de () [] {} <> "" ''
editor.plain.tabcompletion=Autocompletado (palabra clave+Tab)
editor.plain.tabcompletion.title=expansi�n de la palabra clave a marcado Wiki