Author: knguyen
Date: Fri Oct 12 12:13:37 2007
New Revision: 18849
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18849&repname=
=3Djahia
Log:
enable internationalization of date picker for en,fr,de,it,nl languages.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/calendar=
/calendar.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/timebase=
dpublishing/calendar.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/lang/calendar-de.js
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/lang/calendar-fr.js
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/lang/calendar-it.js
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/lang/calendar-nl.js
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/ca=
lendar/calendar.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/calendar/calendar.jsp&rev=3D18849=
&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/calendar=
/calendar.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/calendar=
/calendar.jsp Fri Oct 12 12:13:37 2007
@@ -15,6 +15,9 @@
See the License for the specific language governing permissions and =
limitations under the License.
--%><%@ page import=3D"org.jahia.bin.*"%>
+<%@ page import=3D"java.util.*" %>
+<%@ page import=3D"org.jahia.params.ParamBean" %>
+<%@ page import=3D"org.jahia.engines.*"%>
<%@ page import=3D"org.jahia.engines.calendar.CalendarHandler"%>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<%@ taglib uri=3D"ajaxLib" prefix=3D"ajax" %>
@@ -32,13 +35,41 @@
Boolean alreadyIncluedCalendar =3D (Boolean) request.getAttribute("alr=
eadyInclucedCalendar");
if (alreadyIncluedCalendar =3D=3D null) {
request.setAttribute("alreadyInclucedCalendar", Boolean.TRUE);
+
+ HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.engine=
s.EngineHashMap");
+ if ( engineMap =3D=3D null ){
+ engineMap =3D (HashMap) request.getAttribute("jahia_session_engineMa=
p");
+ }
+ if ( engineMap =3D=3D null ){
+ engineMap =3D
(HashMap)session.getAttribute("jahia_session_engineMap=
");
+ }
+
+ final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
+ EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+ if (elh =3D=3D null) {
+ elh =3D new EngineLanguageHelper(jParams.getLocale());
+ }
+
+ // Put here all languages we have tested
+ String calendarLocale =3D "en";
+ ArrayList supportedLocales =3D new ArrayList();
+ supportedLocales.add("en");
+ supportedLocales.add("fr");
+ supportedLocales.add("de");
+ supportedLocales.add("it");
+ supportedLocales.add("nl");
+ if ( supportedLocales.contains(elh.getCurrentLanguageCode()) ){
+ calendarLocale =3D elh.getCurrentLanguageCode();
+ } else if ( supportedLocales.contains(elh.getCurrentLocale().getLangua=
ge()) ){
+ calendarLocale =3D elh.getCurrentLocale().getLanguage();
+ }
%>
<link rel=3D"stylesheet" type=3D"text/css" media=3D"all"
href=3D"<jahia:serverHttpPath/>/jsp/jahia/javascript/jscalendar-1.0/=
skins/aqua/theme.css" title=3D"aqua"/>
<script type=3D"text/javascript"
src=3D"<jahia:serverHttpPath/>/jsp/jahia/javascript/jscalendar-1.0=
/calendar.js"></script>
<script type=3D"text/javascript"
- src=3D"<jahia:serverHttpPath/>/jsp/jahia/javascript/jscalendar-1.0=
/lang/calendar-en.js"></script>
+ src=3D"<jahia:serverHttpPath/>/jsp/jahia/javascript/jscalendar-1.0=
/lang/calendar-<%=3DcalendarLocale%>.js"></script>
<script type=3D"text/javascript"
src=3D"<jahia:serverHttpPath/>/jsp/jahia/javascript/jscalendar-1.0=
/calendar-setup.js"></script>
<script type=3D"text/javascript"
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/ti=
mebasedpublishing/calendar.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/timebasedpublishing/calendar.jsp&=
rev=3D18849&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/timebase=
dpublishing/calendar.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/timebase=
dpublishing/calendar.jsp Fri Oct 12 12:13:37 2007
@@ -15,8 +15,11 @@
See the License for the specific language governing permissions and =
limitations under the License.
--%><%@ page language=3D"java" contentType=3D"text/html;charset=3DUTF-8" %>
+<%@ page import=3D"java.util.*" %>
+<%@ page import=3D"org.jahia.params.*" %>
<%@ page import=3D"org.jahia.bin.Jahia" %>
<%@ page import=3D"org.jahia.engines.timebasedpublishing.CalendarHandler" =
%>
+<%@ page import=3D"org.jahia.engines.*" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
=
<%
@@ -33,6 +36,27 @@
textSize =3D 30;
}
}
+ final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
+ final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
+
+ EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+ if (elh =3D=3D null) {
+ elh =3D new EngineLanguageHelper(jParams.getLocale());
+ }
+
+ // Put here all languages we have tested
+ String calendarLocale =3D "en";
+ ArrayList supportedLocales =3D new ArrayList();
+ supportedLocales.add("en");
+ supportedLocales.add("fr");
+ supportedLocales.add("de");
+ supportedLocales.add("it");
+ supportedLocales.add("nl");
+ if ( supportedLocales.contains(elh.getCurrentLanguageCode()) ){
+ calendarLocale =3D elh.getCurrentLanguageCode();
+ } else if ( supportedLocales.contains(elh.getCurrentLocale().getLangua=
ge()) ){
+ calendarLocale =3D elh.getCurrentLocale().getLanguage();
+ }
=
Boolean alreadyIncluedCalendar =3D (Boolean) request.getAttribute("alr=
eadyInclucedCalendar");
if (alreadyIncluedCalendar =3D=3D null) {
@@ -44,7 +68,7 @@
<script type=3D"text/javascript"
src=3D"<jahia:serverHttpPath/>/jsp/jahia/javascript/jscalendar-1.0=
/calendar.js"></script>
<script type=3D"text/javascript"
- src=3D"<jahia:serverHttpPath/>/jsp/jahia/javascript/jscalendar-1.0=
/lang/calendar-en.js"></script>
+ src=3D"<jahia:serverHttpPath/>/jsp/jahia/javascript/jscalendar-1.0=
/lang/calendar-<%=3DcalendarLocale%>.js"></script>
<script type=3D"text/javascript"
src=3D"<jahia:serverHttpPath/>/jsp/jahia/javascript/jscalendar-1.0=
/calendar-setup.js"></script>
<% } %>
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript=
/jscalendar-1.0/lang/calendar-de.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/javascript/jscalendar-1.0/lang/calendar-d=
e.js&rev=3D18849&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/lang/calendar-de.js (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/lang/calendar-de.js Fri Oct 12 12:13:37 2007
@@ -43,6 +43,11 @@
"Sa",
"So");
=
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD =3D 0;
+
// full month names
Calendar._MN =3D new Array
("Januar",
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript=
/jscalendar-1.0/lang/calendar-fr.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/javascript/jscalendar-1.0/lang/calendar-f=
r.js&rev=3D18849&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/lang/calendar-fr.js (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/lang/calendar-fr.js Fri Oct 12 12:13:37 2007
@@ -45,20 +45,24 @@
"Sam",
"Dim");
=
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD =3D 0;
+
// full month names
Calendar._MN =3D new Array
("Janvier",
- "F=C3=A9vrier",
+ "F\u00e9vrier",
"Mars",
"Avril",
"Mai",
"Juin",
"Juillet",
- "Ao=C3=BBt",
+ "Ao\u00fbt",
"Septembre",
"Octobre",
"Novembre",
- "D=C3=A9cembre");
+ "D\u00e9cembre");
=
// short month names
Calendar._SMN =3D new Array
@@ -83,7 +87,7 @@
"DHTML Date/Heure Selecteur\n" +
"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate t=
his this ;-)
"Pour la derniere version visitez : http://www.dynarch.com/projects/calend=
ar/\n" +
-"Distribu=C3=A9 par GNU LGPL. Voir http://gnu.org/licenses/lgpl.html pour=
les details." +
+"Distribu\u00e9 par GNU LGPL. Voir http://gnu.org/licenses/lgpl.html pour=
les details." +
"\n\n" +
"Selection de la date :\n" +
"- Utiliser les bouttons \xab, \xbb pour selectionner l\'annee\n" +
@@ -95,13 +99,13 @@
"- ou Maj-clic pour decrementer\n" +
"- ou clic et glisser-deplacer pour une selection plus rapide";
=
-Calendar._TT["PREV_YEAR"] =3D "Ann=C3=A9e pr=C3=A9c. (maintenir pour menu)=
";
-Calendar._TT["PREV_MONTH"] =3D "Mois pr=C3=A9c. (maintenir pour menu)";
+Calendar._TT["PREV_YEAR"] =3D "Ann\u00e9e pr\u00e9c. (maintenir pour menu)=
";
+Calendar._TT["PREV_MONTH"] =3D "Mois pr\u00e9c. (maintenir pour menu)";
Calendar._TT["GO_TODAY"] =3D "Atteindre la date du jour";
Calendar._TT["NEXT_MONTH"] =3D "Mois suiv. (maintenir pour menu)";
-Calendar._TT["NEXT_YEAR"] =3D "Ann=C3=A9e suiv. (maintenir pour menu)";
-Calendar._TT["SEL_DATE"] =3D "S=C3=A9lectionner une date";
-Calendar._TT["DRAG_TO_MOVE"] =3D "D=C3=A9placer";
+Calendar._TT["NEXT_YEAR"] =3D "Ann\u00e9e suiv. (maintenir pour menu)";
+Calendar._TT["SEL_DATE"] =3D "S\u00e9lectionner une date";
+Calendar._TT["DRAG_TO_MOVE"] =3D "D\u00e9placer";
Calendar._TT["PART_TODAY"] =3D " (Aujourd'hui)";
=
// the following is to inform that "%s" is to be the first day of week
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript=
/jscalendar-1.0/lang/calendar-it.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/javascript/jscalendar-1.0/lang/calendar-i=
t.js&rev=3D18849&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/lang/calendar-it.js (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/lang/calendar-it.js Fri Oct 12 12:13:37 2007
@@ -44,6 +44,10 @@
"Sab",
"Dom");
=
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD =3D 0;
+
// full month names
Calendar._MN =3D new Array
("Gennaio",
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript=
/jscalendar-1.0/lang/calendar-nl.js
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/javascript/jscalendar-1.0/lang/calendar-n=
l.js&rev=3D18849&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/lang/calendar-nl.js (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/jscal=
endar-1.0/lang/calendar-nl.js Fri Oct 12 12:13:37 2007
@@ -9,7 +9,21 @@
"Zaterdag",
"Zondag");
=
-Calendar._SDN_len =3D 2;
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD =3D 0;
+
+
+// short day names
+Calendar._SDN =3D new Array
+("Sun",
+ "Mon",
+ "Tue",
+ "Wed",
+ "Thu",
+ "Fri",
+ "Sat",
+ "Sun");
=
Calendar._MN =3D new Array
("Januari",
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
