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 2013/12/02 23:37:54 UTC
svn commit: r1547228 - in /jspwiki/trunk/jspwiki-war/src/main/webapp:
Login.jsp UserPreferences.jsp
Author: juanpablo
Date: Mon Dec 2 22:37:53 2013
New Revision: 1547228
URL: http://svn.apache.org/r1547228
Log:
* left behind on previous commit: using Preferences.getLocale( WikiContext ) instead of WikiContext.getLocale( WikiContext )
Modified:
jspwiki/trunk/jspwiki-war/src/main/webapp/Login.jsp
jspwiki/trunk/jspwiki-war/src/main/webapp/UserPreferences.jsp
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Login.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Login.jsp?rev=1547228&r1=1547227&r2=1547228&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Login.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Login.jsp Mon Dec 2 22:37:53 2013
@@ -77,7 +77,7 @@
// User collision! (full name or wiki name already taken)
wikiSession.addMessage( "profile", wiki.getInternationalizationManager()
.get( InternationalizationManager.CORE_BUNDLE,
- WikiContext.getLocale( wikiContext ),
+ Preferences.getLocale( wikiContext ),
due.getMessage(), due.getArgs() ) );
}
catch( DecisionRequiredException e )
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/UserPreferences.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/UserPreferences.jsp?rev=1547228&r1=1547227&r2=1547228&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/UserPreferences.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/UserPreferences.jsp Mon Dec 2 22:37:53 2013
@@ -78,7 +78,7 @@
// User collision! (full name or wiki name already taken)
wikiSession.addMessage( "profile", wiki.getInternationalizationManager()
.get( InternationalizationManager.CORE_BUNDLE,
- WikiContext.getLocale( wikiContext ),
+ Preferences.getLocale( wikiContext ),
due.getMessage(), due.getArgs() ) );
}
catch( DecisionRequiredException e )