Author: bpapez
Date: Wed Jun 6 17:47:11 2007
New Revision: 17479
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17479&repname=
=3Djahia
Log:
get some hardcoded messages from resourcebundle
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources.p=
roperties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_d=
e.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_e=
n.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/viewhelper/si=
temap/PageSiteMap.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResou=
rces.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaMessageResources.properties&rev=3D17479&rep=
name=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/conf/java/JahiaMessageResources.p=
roperties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources.p=
roperties Wed Jun 6 17:47:11 2007
@@ -298,6 +298,8 @@
org.jahia.engines.users.newuserregistration.unauthorizedGroup =3D User tri=
ed to register into unauthorized group {0}
=
org.jahia.engines.workflow.activationResultMessage =3D {0} ({1} {2} : lang=
uage {3})
+org.jahia.engines.workflow.pageNotApplicable =3D Page ({0}) N/A in {=
1}
+org.jahia.engines.workflow.pageNotExisting =3D Page does not exist
=
org.jahia.engines.shared.BigText_Field.stagingWarning =3D Page [<strong>{0=
}</strong>] is in state "<strong>staging</strong>" and has never been valid=
ated, which will cause a "<strong>403 Error</strong>" in "Live" mode, if th=
e link is followed.
org.jahia.engines.shared.BigText_Field.markForDeleteWarning =3D Page [<str=
ong>{0}</strong>] is in state "<strong>markForDelete</strong>" which will c=
ause a "<strong>404 Error</strong>" after validation, if the link is follow=
ed.
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResou=
rces_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaMessageResources_de.properties&rev=3D17479&=
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/conf/java/JahiaMessageResources_d=
e.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_d=
e.properties Wed Jun 6 17:47:11 2007
@@ -294,6 +294,8 @@
org.jahia.engines.users.newuserregistration.unauthorizedGroup =3D Der Benu=
tzer hat versucht, sich in einer nicht zul=C3=A4ssigen Gruppe {0} anzumelde=
n.
=
org.jahia.engines.workflow.activationResultMessage =3D {0} ({1} {2}: Sprac=
he {3})
+org.jahia.engines.workflow.pageNotApplicable =3D Seite ({0}) keine A=
ngabe in {1}
+org.jahia.engines.workflow.pageNotExisting =3D Seite existiert nic=
ht
=
org.jahia.engines.shared.BigText_Field.stagingWarning =3D Die Seite [<stro=
ng>{0}</strong>] befindet sich noch im "<strong>Staging-Status</strong>", d=
a sie noch nicht validiert wurde. Die Ausf=C3=BChrung des Links kann deshal=
b den <strong>Fehler 403</strong> im Live-Modus verursachen.
org.jahia.engines.shared.BigText_Field.markForDeleteWarning =3D Die Seite =
[<strong>{0}</strong>] wurde "<strong>zum L=C3=B6schen markiert</strong>". =
Die Ausf=C3=BChrung des Links kann deshalb nach der Validierung den <strong=
>Fehler 404</strong> verursachen.
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResou=
rces_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaMessageResources_en.properties&rev=3D17479&=
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/conf/java/JahiaMessageResources_e=
n.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaMessageResources_e=
n.properties Wed Jun 6 17:47:11 2007
@@ -298,6 +298,8 @@
org.jahia.engines.users.newuserregistration.unauthorizedGroup =3D User tri=
ed to register into unauthorized group {0}
=
org.jahia.engines.workflow.activationResultMessage =3D {0} ({1} {2} : lang=
uage {3})
+org.jahia.engines.workflow.pageNotApplicable =3D Page ({0}) N/A in {=
1}
+org.jahia.engines.workflow.pageNotExisting =3D Page does not exist
=
org.jahia.engines.shared.BigText_Field.stagingWarning =3D Page [<strong>{0=
}</strong>] is in state "<strong>staging</strong>" and has never been valid=
ated, which will cause a "<strong>403 Error</strong>" in "Live" mode, if th=
e link is followed.
org.jahia.engines.shared.BigText_Field.markForDeleteWarning =3D Page [<str=
ong>{0}</strong>] is in state "<strong>markForDelete</strong>" which will c=
ause a "<strong>404 Error</strong>" after validation, if the link is follow=
ed.
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/viewhel=
per/sitemap/PageSiteMap.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/viewhelper/sitemap/PageSiteMap.java&re=
v=3D17479&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/java/org/jahia/data/viewhelper/si=
temap/PageSiteMap.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/viewhelper/si=
temap/PageSiteMap.java Wed Jun 6 17:47:11 2007
@@ -48,15 +48,19 @@
=
import org.jahia.content.*;
import org.jahia.exceptions.JahiaException;
+import org.jahia.resourcebundle.JahiaResourceBundle;
import org.jahia.services.fields.ContentSmallTextField;
import org.jahia.services.pages.ContentPage;
import org.jahia.services.pages.JahiaPageBaseService;
import org.jahia.services.version.ContentObjectEntryState;
+import org.jahia.utils.LanguageCodeConverters;
=
import java.io.Serializable;
+import java.text.MessageFormat;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
=
/**
* <p>Title: Informations site map page</p>
@@ -202,6 +206,7 @@
private String getAPageTitleAnyway(String languageCode) {
String pageTitle1 =3D ((String)this.titles.get(languageCode));
if (pageTitle1 =3D=3D null) {
+ Locale locale =3D LanguageCodeConverters.languageCodeToLocale(=
languageCode); =
if (objectKey.getType().equals(ContentPageKey.PAGE_TYPE)) {
try {
ContentPage contentPage =3D JahiaPageBaseService.getIn=
stance().
@@ -210,13 +215,19 @@
Hashtable titles =3D contentPage.getTitles(Content=
Page.ACTIVATED_PAGE_TITLES);
pageTitle1 =3D (String)titles.get(languageCode);
} else {
- pageTitle1 =3D "N/A";
+ String msgFormat =3D =
+ JahiaResourceBundle.getMessageResource("org.ja=
hia.engines.workflow.pageNotApplicable",
+ locale); =
+ Object[] arguments =3D {new Integer(this.pageID), =
+ LanguageCodeConverters.languageCodeToLocal=
e(languageCode).getDisplayName(locale)};
+ pageTitle1 =3D MessageFormat.format(msgFormat, arg=
uments);
// pageTitle1 =3D "Page title (" + this.pageID + "=
) N/A in ";
// pageTitle1 +=3D LanguageCodeConverters.language=
CodeToLocale(languageCode).getDisplayName();
}
} catch (JahiaException je) {
logger.debug("Cannot recover the page with ID " + page=
ID);
- return "Page does not exist";
+ return JahiaResourceBundle.getMessageResource("org.jah=
ia.engines.workflow.pageNotExisting",
+ locale);
}
} else {
try {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
