pvollenweider 2005/06/06 14:03:41 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java JahiaAdministrationResources.properties
JahiaAdministrationResources_de.properties
JahiaAdministrationResources_fr.properties
JahiaEnginesResources.properties
JahiaEnginesResources_en.properties
JahiaEnginesResources_fr.properties
src/views/jsp/jahia/administration manage_categories.jsp
src/views/jsp/jahia/engines/categories manage_categories.jsp
Log:
Add resource bundle key for the categories
Revision Changes Path
1.31.2.5.2.3 +2 -1
jahia/src/java/JahiaAdministrationResources.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaAdministrationResources.properties.diff?r1=1.31.2.5.2.2&r2=1.31.2.5.2.3&f=h
1.1.2.3.2.3 +2 -1
jahia/src/java/JahiaAdministrationResources_de.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaAdministrationResources_de.properties.diff?r1=1.1.2.3.2.2&r2=1.1.2.3.2.3&f=h
1.35.2.7.2.5 +1 -0
jahia/src/java/JahiaAdministrationResources_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaAdministrationResources_fr.properties.diff?r1=1.35.2.7.2.4&r2=1.35.2.7.2.5&f=h
1.58.2.5.2.6 +1 -0 jahia/src/java/JahiaEnginesResources.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaEnginesResources.properties.diff?r1=1.58.2.5.2.5&r2=1.58.2.5.2.6&f=h
1.26.2.5.2.7 +1 -0 jahia/src/java/JahiaEnginesResources_en.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaEnginesResources_en.properties.diff?r1=1.26.2.5.2.6&r2=1.26.2.5.2.7&f=h
1.35.2.9.2.9 +7 -6 jahia/src/java/JahiaEnginesResources_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaEnginesResources_fr.properties.diff?r1=1.35.2.9.2.8&r2=1.35.2.9.2.9&f=h
1.6.6.2 +24 -10
jahia/src/views/jsp/jahia/administration/manage_categories.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/administration/manage_categories.jsp.diff?r1=1.6.6.1&r2=1.6.6.2&f=h
1.3.6.1 +9 -5
jahia/src/views/jsp/jahia/engines/categories/manage_categories.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/engines/categories/manage_categories.jsp.diff?r1=1.3&r2=1.3.6.1&f=h
Index: JahiaAdministrationResources.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaAdministrationResources.properties,v
retrieving revision 1.31.2.5.2.2
retrieving revision 1.31.2.5.2.3
diff -u -r1.31.2.5.2.2 -r1.31.2.5.2.3
--- JahiaAdministrationResources.properties 3 Jun 2005 10:30:13 -0000
1.31.2.5.2.2
+++ JahiaAdministrationResources.properties 6 Jun 2005 12:03:39 -0000
1.31.2.5.2.3
@@ -26,6 +26,7 @@
org.jahia.admin.backToMenu.label= Back to menu
org.jahia.admin.build.label= Build
org.jahia.admin.cancel.label= Cancel
+org.jahia.admin.categories.ManageCategories.key.label=Key
org.jahia.admin.categories.ManageCategories.addNewCategory.label=Add new
category...
org.jahia.admin.categories.ManageCategories.addExistingCategory.label=Add
existing category...
org.jahia.admin.categories.ManageCategories.categories.label=Categories
@@ -321,7 +322,7 @@
org.jahia.admin.search.ManageSearch.status.lastFullIndexationStartedAt.label
= Last full indexation started at
org.jahia.admin.search.ManageSearch.status.nbOfDocsAddedToIndexationQueue.label
= Nb. of documents added to indexation queue
org.jahia.admin.search.ManageSearch.status.nbOfDocsInMainQueue.label = Nb.
of documents in main index queue
-org.jahia.admin.search.ManageSearch.status.nbOfDocsLeft.label = Nb. of
documents left
+org.jahia.admin.search.ManageSearch.status.nbOfDocsLeft.label = Nb. of
documents left
org.jahia.admin.search.ManageSearch.status.nbOfFilesInMainQueue.label = Nb.
of files in main index queue
org.jahia.admin.search.ManageSearch.status.totalNumberOfDocsToIndex.label =
Total number of documents to index
org.jahia.admin.search.ManageSearch.theIndexCanTake.label= The indexation
can take several minutes regarding to the size of your site !
Index: JahiaAdministrationResources_de.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaAdministrationResources_de.properties,v
retrieving revision 1.1.2.3.2.2
retrieving revision 1.1.2.3.2.3
diff -u -r1.1.2.3.2.2 -r1.1.2.3.2.3
--- JahiaAdministrationResources_de.properties 3 Jun 2005 10:30:13
-0000 1.1.2.3.2.2
+++ JahiaAdministrationResources_de.properties 6 Jun 2005 12:03:39
-0000 1.1.2.3.2.3
@@ -23,6 +23,7 @@
org.jahia.admin.backToMenu.label= Zurück zum Menü
org.jahia.admin.build.label= Build
org.jahia.admin.cancel.label= Abbrechen
+org.jahia.admin.categories.ManageCategories.key.label=Key
org.jahia.admin.categories.ManageCategories.addExistingCategory.label=
Bestehende Kategorie hinzufügen...
org.jahia.admin.categories.ManageCategories.addNewCategory.label= Neue
Kategorie hinzufügen...
org.jahia.admin.categories.ManageCategories.categories.label= Kategorien
@@ -406,7 +407,7 @@
org.jahia.admin.search.ManageSearch.status.lastFullIndexationStartedAt.label
= Last full indexation started at
org.jahia.admin.search.ManageSearch.status.nbOfDocsAddedToIndexationQueue.label
= Nb. of documents added to indexation queue
org.jahia.admin.search.ManageSearch.status.nbOfDocsInMainQueue.label = Nb.
of documents in main index queue
-org.jahia.admin.search.ManageSearch.status.nbOfDocsLeft.label = Nb. of
documents left
+org.jahia.admin.search.ManageSearch.status.nbOfDocsLeft.label = Nb. of
documents left
org.jahia.admin.search.ManageSearch.status.nbOfFilesInMainQueue.label = Nb.
of files in main index queue
org.jahia.admin.search.ManageSearch.status.totalNumberOfDocsToIndex.label =
Total number of documents to index
org.jahia.admin.search.ManageSearch.theIndexCanTake.label= Der Indexation
kann einige Minuten dauern, schauen sie die Grösse auf ihre Seite an!
Index: JahiaAdministrationResources_fr.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaAdministrationResources_fr.properties,v
retrieving revision 1.35.2.7.2.4
retrieving revision 1.35.2.7.2.5
diff -u -r1.35.2.7.2.4 -r1.35.2.7.2.5
--- JahiaAdministrationResources_fr.properties 6 Jun 2005 08:35:44
-0000 1.35.2.7.2.4
+++ JahiaAdministrationResources_fr.properties 6 Jun 2005 12:03:39
-0000 1.35.2.7.2.5
@@ -23,6 +23,7 @@
org.jahia.admin.backToMenu.label=Retour au menu
org.jahia.admin.build.label=Build
org.jahia.admin.cancel.label=Annuler
+org.jahia.admin.categories.ManageCategories.key.label=Clé
org.jahia.admin.categories.ManageCategories.addNewCategory.label=Ajouter une
nouvelle catégorie...
org.jahia.admin.categories.ManageCategories.addExistingCategory.label=Ajouter
une catégorie existante...
org.jahia.admin.categories.ManageCategories.categories.label=Catégories
Index: JahiaEnginesResources.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaEnginesResources.properties,v
retrieving revision 1.58.2.5.2.5
retrieving revision 1.58.2.5.2.6
diff -u -r1.58.2.5.2.5 -r1.58.2.5.2.6
--- JahiaEnginesResources.properties 27 Apr 2005 09:22:00 -0000
1.58.2.5.2.5
+++ JahiaEnginesResources.properties 6 Jun 2005 12:03:39 -0000
1.58.2.5.2.6
@@ -520,6 +520,7 @@
org.jahia.engines.available.label
= Available
org.jahia.engines.cancel.label
= Cancel
org.jahia.engines.categories.introText.label
= Please select the categories this object
should be associated with.
+org.jahia.engines.categories.key.label
= Key
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.alertSelectValue.label
= Please select a value
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.alphabeticalAscending.label
= Alphabetical, ascending
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.alphabeticalDescending.label
= Alphabetical, descending
Index: JahiaEnginesResources_en.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaEnginesResources_en.properties,v
retrieving revision 1.26.2.5.2.6
retrieving revision 1.26.2.5.2.7
diff -u -r1.26.2.5.2.6 -r1.26.2.5.2.7
--- JahiaEnginesResources_en.properties 6 Jun 2005 09:11:43 -0000
1.26.2.5.2.6
+++ JahiaEnginesResources_en.properties 6 Jun 2005 12:03:39 -0000
1.26.2.5.2.7
@@ -520,6 +520,7 @@
org.jahia.engines.available.label
= Available
org.jahia.engines.cancel.label
= Cancel
org.jahia.engines.categories.introText.label
= Please select the categories this object
should be associated with.
+org.jahia.engines.categories.key.label
= Key
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.alertSelectValue.label
= Please select a value
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.alphabeticalAscending.label
= Alphabetical, ascending
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.alphabeticalDescending.label
= Alphabetical, descending
Index: JahiaEnginesResources_fr.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaEnginesResources_fr.properties,v
retrieving revision 1.35.2.9.2.8
retrieving revision 1.35.2.9.2.9
diff -u -r1.35.2.9.2.8 -r1.35.2.9.2.9
--- JahiaEnginesResources_fr.properties 6 Jun 2005 09:11:43 -0000
1.35.2.9.2.8
+++ JahiaEnginesResources_fr.properties 6 Jun 2005 12:03:39 -0000
1.35.2.9.2.9
@@ -214,6 +214,7 @@
org.jahia.engines.available.label
= Disponible
org.jahia.engines.cancel.label
= Abandonner
org.jahia.engines.categories.introText.label
= Veuillez sélectionner les
catégories dont cet objet de contenu fera partie.
+org.jahia.engines.categories.key.label
= Clé
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.alertSelectValue.label
= Veuillez sélectionner une valeur
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.alphabeticalAscending.label
= Alphabétique, croissant
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.alphabeticalDescending.label
= Alphabétique, décroissant
@@ -471,8 +472,8 @@
org.jahia.engines.shared.Page_Field.exitingJahiaPage.label
= Page déjà existante
(déplacer)
org.jahia.engines.shared.Page_Field.exitingJahiaPageLink.label
= Page déjà existante (lien)
org.jahia.engines.shared.Page_Field.ifThisPageIsChanged.label
= Si cette page est modifiée (<b>lien</b> ou <b>URL</b> ci-dessous) en
page de type lien, tout le contenu de la page originale sera
<i>inaccessible</i> jusqu'à ce qu'elle soit à nouveau
modifiée en type "page directe"
-org.jahia.engines.shared.Page_Field.jahiaPageCreation.label
= <I>Création</I> d'une page Jahia
-org.jahia.engines.shared.Page_Field.jahiaPageEdition.label
= <I>Edition</I> d'une page Jahia
+org.jahia.engines.shared.Page_Field.jahiaPageCreation.label
= Création d'une page Jahia
+org.jahia.engines.shared.Page_Field.jahiaPageEdition.label
= Edition d'une page Jahia
org.jahia.engines.shared.Page_Field.jahiaPageTitle.label
= Titre de la page Jahia (dans la langue sélectionnée
précédemment)
org.jahia.engines.shared.Page_Field.languages.label
= langues
org.jahia.engines.shared.Page_Field.linkExistingPage.label
= <b>Lier</b> à une page Jahia existante
@@ -584,7 +585,7 @@
org.jahia.engines.version.pagerevisiontype.2
= Modif. de contenu
org.jahia.engines.version.pagerevisiontype.3
= Modif. de contenu et attributs de page
org.jahia.engines.version.pagerevisiontype.4
= Suppression de page
-org.jahia.engines.version.pagesSelection
= Pages selection
+org.jahia.engines.version.pagesSelection
= Sélection des pages
org.jahia.engines.version.pagesThatExistOnlyInStaging
= Les pages jamais encore validées (<span style=" color:
Blue">pages en bleu</span>) ne peuvent pas être invalidées
org.jahia.engines.version.partialRestore
= Restoration partiel
org.jahia.engines.version.partialRestoreDescription
= Restorer seulement du contenu non
supprimé à la<br> date
sélectionnée
@@ -599,9 +600,9 @@
org.jahia.engines.version.revisionTree
= Arbre des révisions
org.jahia.engines.version.selectAnotherTask
= Selectionner une autre tâche
org.jahia.engines.version.selectAPreciseDateFromRevisions
= Choisir une révision précise
-org.jahia.engines.version.selectingPagesToRestore
= Selection des pages à restorer
-org.jahia.engines.version.selectingPagesToUndelete
= Selection des pages à restorer
-org.jahia.engines.version.selectingPagesToUndo
= Selection des pages à invalider
+org.jahia.engines.version.selectingPagesToRestore
= Sélection des pages à restorer
+org.jahia.engines.version.selectingPagesToUndelete
= Sélection des pages à restorer
+org.jahia.engines.version.selectingPagesToUndo
= Sélection des pages à invalider
org.jahia.engines.version.selectTheTaskToPerform
= Veuillez choisir l'opération à effectuer
org.jahia.engines.version.showRevisionsFor
= Lister les révisions pour
org.jahia.engines.version.stagingContentWillBeOverriden
= Les modifications en cours seront écrasées !
Index: manage_categories.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/administration/Attic/manage_categories.jsp,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.2
diff -u -r1.6.6.1 -r1.6.6.2
--- manage_categories.jsp 13 Apr 2005 14:57:53 -0000 1.6.6.1
+++ manage_categories.jsp 6 Jun 2005 12:03:40 -0000 1.6.6.2
@@ -137,14 +137,23 @@
%>
<a
href='<%=JahiaAdministration.composeActionURL(request,response,"categories","&sub=display&guitree=expand&nodeindex="+i+"¤tCategoryKey="
+ curCategory.getKey())%>'>
<% String catDisplay =
curCategory.getTitle(jData.params().getLocale());
+ if
(curCategory.getKey().equals(currentCategoryKey)) {
+ %><b><%
+ }
if (catDisplay == null) {
- catDisplay = "(key=" +
curCategory.getKey() + ")";
+ %>
+ (<jahia:adminResourceBundle
+
resourceName="org.jahia.admin.categories.ManageCategories.key.label" />
+ = <%=curCategory.getKey()%>)
+ <%
+ } else {
+ %><%= catDisplay %><%
+ }
+ if
(curCategory.getKey().equals(currentCategoryKey)) {
+ %></b><%
}
- if
(curCategory.getKey().equals(currentCategoryKey)) { %>
- <b><%= catDisplay %></b>
- <% } else { %>
- <%= catDisplay %>
- <% } %>
+ %>
+
</a>
<%
}
@@ -173,12 +182,17 @@
while (currentCategoryChildIter.hasNext()) {
Category curChildCategory = (Category)
currentCategoryChildIter.next();
String catDisplay =
curChildCategory.getTitle(jData.params().getLocale());
- if (catDisplay == null) {
- catDisplay = "(key=" + curChildCategory.getKey() + ")";
- }
%>
<tr>
- <td class="text" valign="top"><%= catDisplay %></td>
+ <td class="text" valign="top">
+ <% if (catDisplay == null) { %>
+ (<jahia:adminResourceBundle
+
resourceName="org.jahia.admin.categories.ManageCategories.key.label" />
+ = <%=curChildCategory.getKey()%>)
+ <% } else { %>
+ <%= catDisplay %>
+ <% } %>
+ </td>
<td class="text" valign="top">
<a
href='<%=JahiaAdministration.composeActionURL(request,response,"categories","&sub=editCategory&parentCategoryKey="
+ currentCategoryKey + "¤tCategoryKey=" + curChildCategory.getKey())%>'
><jahia:adminResourceBundle
resourceName="org.jahia.admin.categories.ManageCategories.editCategoryAction.label"/></a>
Index: manage_categories.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/engines/categories/Attic/manage_categories.jsp,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- manage_categories.jsp 28 Jul 2003 17:36:28 -0000 1.3
+++ manage_categories.jsp 6 Jun 2005 12:03:40 -0000 1.3.6.1
@@ -110,13 +110,17 @@
if ( nodeInfo instanceof Category ){
Category curCategory = (Category) nodeInfo;
String catDisplay =
curCategory.getTitle(jData.params().getLocale());
- if (catDisplay == null) {
- catDisplay = "(key=" + curCategory.getKey() +
")";
- }
if
(selectedCategories.contains(curCategory.getKey())) { %>
- <input type="checkbox"
name="category_<%=curCategory.getKey()%>" checked=""><%= catDisplay %>
+ <input type="checkbox"
name="category_<%=curCategory.getKey()%>" checked="">
<% } else { %>
- <input type="checkbox"
name="category_<%=curCategory.getKey()%>"><%= catDisplay %>
+ <input type="checkbox"
name="category_<%=curCategory.getKey()%>">
+ <% }
+ if (catDisplay == null) { %>
+ (<jahia:engineResourceBundle
+
resourceName="org.jahia.engines.categories.key.label" />
+ = <%=curCategory.getKey()%>)
+ <% } else { %>
+ <%= catDisplay %>
<% }
}
%>
