shuber 2005/10/11 11:18:30 CEST
Modified files:
core/src/conf/java JahiaMessageResources.properties
JahiaMessageResources_en.properties
JahiaMessageResources_fr.properties
core/src/java/org/jahia/content ContentContainerKey.java
ContentContainerListKey.java
Log:
- Modified congratulations text to detail how to properly shutdown Jahia
- Renamed Objectkey constants for container and container list, which fixes
the categories browsing template.
Revision Changes Path
1.22 +2 -2 jahia/core/src/conf/java/JahiaMessageResources.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaMessageResources.properties.diff?r1=1.21&r2=1.22&f=h
1.19 +2 -2
jahia/core/src/conf/java/JahiaMessageResources_en.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaMessageResources_en.properties.diff?r1=1.18&r2=1.19&f=h
1.22 +1 -1
jahia/core/src/conf/java/JahiaMessageResources_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaMessageResources_fr.properties.diff?r1=1.21&r2=1.22&f=h
1.3 +1 -1
jahia/core/src/java/org/jahia/content/ContentContainerKey.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/content/ContentContainerKey.java.diff?r1=1.2&r2=1.3&f=h
1.3 +1 -1
jahia/core/src/java/org/jahia/content/ContentContainerListKey.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/content/ContentContainerListKey.java.diff?r1=1.2&r2=1.3&f=h
Index: JahiaMessageResources.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/JahiaMessageResources.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JahiaMessageResources.properties 7 Oct 2005 08:48:13 -0000 1.21
+++ JahiaMessageResources.properties 11 Oct 2005 09:18:29 -0000 1.22
@@ -94,9 +94,9 @@
org.jahia.bin.JahiaConfigurationWizard.advsettings.notaBeneWarning.label
= N.B.
Warning, not all the browsers are UTF-8 compliant, so you may encounter some
issues with certain old browsers
org.jahia.bin.JahiaConfigurationWizard.advsettings.storeInDB.label
= Store dav files
(BLOB) and big text (CLOB) in database instead of file system.
org.jahia.bin.JahiaConfigurationWizard.congratulations.congratulationsItWork.label
= Congratulations, you
have successfully installed Jahia
-org.jahia.bin.JahiaConfigurationWizard.congratulations.jahiaSuccessfullyInstalledAndConfigured.label
= Jahia is now successfully installed and configured. Please click
on the connect button below to close the configuration wizard and start your
Jahia experience
+org.jahia.bin.JahiaConfigurationWizard.congratulations.jahiaSuccessfullyInstalledAndConfigured.label
= Jahia is now successfully installed and configured. Please
shutdown Jahia properly and restart it.
org.jahia.bin.JahiaConfigurationWizard.congratulations.pleaseBePatient.label
= Please be patient
upon first page access, because the Java Server Pages (JSP) have to be
compiled. This may take between 30 seconds and one minute and this only occurs
once per page
-org.jahia.bin.JahiaConfigurationWizard.congratulations.pleaseRestart.label
= Please restart
Jahia now.
+org.jahia.bin.JahiaConfigurationWizard.congratulations.pleaseRestart.label
= Please shutdown
Jahia, wait for complete shutdown, and then restart it.
org.jahia.bin.JahiaConfigurationWizard.congratulations.daysLeftInLicense.label
= Your license will expire in {0} days
org.jahia.bin.JahiaConfigurationWizard.errorconfigured.jahiaAlreadyInstalledAndConfigured.label
= Jahia is already installed and configured
org.jahia.bin.JahiaConfigurationWizard.errorsave.error.label
=
Error
Index: JahiaMessageResources_en.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/JahiaMessageResources_en.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- JahiaMessageResources_en.properties 5 Oct 2005 13:49:10 -0000
1.18
+++ JahiaMessageResources_en.properties 11 Oct 2005 09:18:29 -0000
1.19
@@ -87,9 +87,9 @@
org.jahia.bin.JahiaConfigurationWizard.advsettings.extendedSetOfCharacters.label
= support of extended
set of characters
org.jahia.bin.JahiaConfigurationWizard.advsettings.notaBeneWarning.label
= N.B.
Warning, not all the browsers are UTF-8 compliant, so you may encounter some
issues with certain old browsers
org.jahia.bin.JahiaConfigurationWizard.congratulations.congratulationsItWork.label
= Congratulations, you
have successfully installed Jahia
-org.jahia.bin.JahiaConfigurationWizard.congratulations.jahiaSuccessfullyInstalledAndConfigured.label
= Jahia is now successfully installed and configured. Please click
on the connect button below to close the configuration wizard and start your
Jahia experience
+org.jahia.bin.JahiaConfigurationWizard.congratulations.jahiaSuccessfullyInstalledAndConfigured.label
= Jahia is now successfully installed and configured. Please
shutdown Jahia properly and restart it.
org.jahia.bin.JahiaConfigurationWizard.congratulations.pleaseBePatient.label
= Please be patient
upon first page access, because the Java Server Pages (JSP) have to be
compiled. This may take between 30 seconds and one minute and this only occurs
once per page
-org.jahia.bin.JahiaConfigurationWizard.congratulations.pleaseRestart.label
= Please restart
Jahia now.
+org.jahia.bin.JahiaConfigurationWizard.congratulations.pleaseRestart.label
= Please shutdown
Jahia, wait for complete shutdown, and then restart it.
org.jahia.bin.JahiaConfigurationWizard.congratulations.daysLeftInLicense.label
= Your license will expire in {0} days
org.jahia.bin.JahiaConfigurationWizard.errorconfigured.jahiaAlreadyInstalledAndConfigured.label
= Jahia is already installed and configured
org.jahia.bin.JahiaConfigurationWizard.errorsave.error.label
=
Error
Index: JahiaMessageResources_fr.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/JahiaMessageResources_fr.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JahiaMessageResources_fr.properties 7 Oct 2005 08:48:13 -0000
1.21
+++ JahiaMessageResources_fr.properties 11 Oct 2005 09:18:29 -0000
1.22
@@ -98,7 +98,7 @@
org.jahia.bin.JahiaConfigurationWizard.congratulations.congratulationsItWork.label
= Félicitations,
Jahia est installé
org.jahia.bin.JahiaConfigurationWizard.congratulations.jahiaSuccessfullyInstalledAndConfigured.label
= Jahia est maintenant installé et a été
configuré avec succès
org.jahia.bin.JahiaConfigurationWizard.congratulations.pleaseBePatient.label
= Soyez patient lors
du premier accès à une page, le temps au JSP (Java Server Pages)
d'être compilé. Cela devrait prendre entre 30 secondes et 1 minute
et n'avoir lieu que lors du premier chargement de chaque page
-org.jahia.bin.JahiaConfigurationWizard.congratulations.pleaseRestart.label
= Veuillez s'il
vous plaît redémarrer Jahia maintenant
+org.jahia.bin.JahiaConfigurationWizard.congratulations.pleaseRestart.label
= Veuillez s'il
vous plaît arrêter Jahia, attendre l'arrêt complet, et
redémarrer.
org.jahia.bin.JahiaConfigurationWizard.congratulations.daysLeftInLicense.label
= Votre licence arrivera à expiration dans
{0} jours
org.jahia.bin.JahiaConfigurationWizard.errorconfigured.jahiaAlreadyInstalledAndConfigured.label
= Jahia est déjà installé
et configuré
org.jahia.bin.JahiaConfigurationWizard.errorsave.error.label
=
Erreur
Index: ContentContainerKey.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/content/ContentContainerKey.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContentContainerKey.java 22 Jun 2005 12:32:59 -0000 1.2
+++ ContentContainerKey.java 11 Oct 2005 09:18:30 -0000 1.3
@@ -2,7 +2,7 @@
public class ContentContainerKey extends ContentObjectKey {
- public static final String CONTAINER_TYPE = "JahiaContainer";
+ public static final String CONTAINER_TYPE = "ContentContainer";
static {
ObjectKey.registerType(CONTAINER_TYPE,
ContentContainerKey.class.getName());
Index: ContentContainerListKey.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/content/ContentContainerListKey.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContentContainerListKey.java 22 Jun 2005 12:32:59 -0000 1.2
+++ ContentContainerListKey.java 11 Oct 2005 09:18:30 -0000 1.3
@@ -3,7 +3,7 @@
public class ContentContainerListKey extends ContentObjectKey {
- public static final String CONTAINERLIST_TYPE = "JahiaContainerList";
+ public static final String CONTAINERLIST_TYPE = "ContentContainerList";
static {
ObjectKey.registerType(CONTAINERLIST_TYPE,
ContentContainerListKey.class.getName());
