cvs commit: jahia/core/src/conf/java JahiaEnginesResources.properties JahiaEnginesResources_en.properties JahiaEnginesResources_fr.properties jahia/core/src/webapp/WEB-INF/etc/spring applicationcontext-metadata.xml

Mon, 28 Nov 2005 08:48:55 -0800 

xlawrence    2005/11/28 17:48:35 CET

  Modified files:
    core/src/conf/java   JahiaEnginesResources.properties 
                         JahiaEnginesResources_en.properties 
                         JahiaEnginesResources_fr.properties 
    core/src/webapp/WEB-INF/etc/spring 
                                       applicationcontext-metadata.xml 
  Log:
  - Added Bundles for metadata fields.
  - Added french translation of the metadatas
  
  Revision  Changes    Path
  1.46      +13 -0     jahia/core/src/conf/java/JahiaEnginesResources.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaEnginesResources.properties.diff?r1=1.45&r2=1.46&f=h
  1.36      +14 -1     
jahia/core/src/conf/java/JahiaEnginesResources_en.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaEnginesResources_en.properties.diff?r1=1.35&r2=1.36&f=h
  1.46      +16 -7     
jahia/core/src/conf/java/JahiaEnginesResources_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaEnginesResources_fr.properties.diff?r1=1.45&r2=1.46&f=h
  1.20      +12 -12    
jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-metadata.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-metadata.xml.diff?r1=1.19&r2=1.20&f=h
  
  
  
  Index: JahiaEnginesResources.properties
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/conf/java/JahiaEnginesResources.properties,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- JahiaEnginesResources.properties  28 Nov 2005 10:01:24 -0000      1.45
  +++ JahiaEnginesResources.properties  28 Nov 2005 16:48:35 -0000      1.46
  @@ -1189,3 +1189,16 @@
   org.jahia.engines.importexport.contentpick.noresults.label                   
           = no match
   org.jahia.engines.importexport.contentpick.postfix.author.label              
           = is
   org.jahia.engines.importexport.contentpick.postfix.keywords.label            
           = are the following
  +
  +#MetaData
  +org.jahia.services.metadata.creator                              = Creator
  +org.jahia.services.metadata.lastContributor                      = Last 
contributor
  +org.jahia.services.metadata.lastPublisher                        = Last 
publisher
  +org.jahia.services.metadata.creationDate                         = Creation 
date
  +org.jahia.services.metadata.lastModificationDate         = Last modification 
date
  +org.jahia.services.metadata.lastPublishingDate                       = Last 
publication date
  +org.jahia.services.metadata.description                              = 
Description
  +org.jahia.services.metadata.keywords                         = Keywords
  +org.jahia.services.metadata.hiddenMetadata                       = Hidden 
metadata
  +org.jahia.services.metadata.categories                               = 
Categories
  +org.jahia.services.metadata.pagePath                         = Page path
  \ No newline at end of file
  
  
  
  Index: JahiaEnginesResources_en.properties
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/conf/java/JahiaEnginesResources_en.properties,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- JahiaEnginesResources_en.properties       28 Nov 2005 10:01:24 -0000      
1.35
  +++ JahiaEnginesResources_en.properties       28 Nov 2005 16:48:35 -0000      
1.36
  @@ -917,4 +917,17 @@
   
org.jahia.engines.importexport.contentpick.condition.daterange.week.label=last 
week
   
org.jahia.engines.importexport.contentpick.condition.daterange.months.label=last
 6 months
   org.jahia.engines.importexport.contentpick.welcome.label1=I search a content 
object of type
  -org.jahia.engines.importexport.contentpick.welcome.label2=with
  \ No newline at end of file
  +org.jahia.engines.importexport.contentpick.welcome.label2=with
  +
  +#MetaData
  +org.jahia.services.metadata.creator                              = Creator
  +org.jahia.services.metadata.lastContributor                      = Last 
contributor
  +org.jahia.services.metadata.lastPublisher                        = Last 
publisher
  +org.jahia.services.metadata.creationDate                         = Creation 
date
  +org.jahia.services.metadata.lastModificationDate         = Last modification 
date
  +org.jahia.services.metadata.lastPublishingDate                       = Last 
publication date
  +org.jahia.services.metadata.description                              = 
Description
  +org.jahia.services.metadata.keywords                         = Keywords
  +org.jahia.services.metadata.hiddenMetadata                       = Hidden 
metadata
  +org.jahia.services.metadata.categories                               = 
Categories
  +org.jahia.services.metadata.pagePath                         = Page path
  \ No newline at end of file
  
  
  
  Index: JahiaEnginesResources_fr.properties
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/conf/java/JahiaEnginesResources_fr.properties,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- JahiaEnginesResources_fr.properties       28 Nov 2005 10:01:24 -0000      
1.45
  +++ JahiaEnginesResources_fr.properties       28 Nov 2005 16:48:35 -0000      
1.46
  @@ -431,10 +431,6 @@
   org.jahia.engines.shared.File_Field.unknownFile.label                        
                                 = Fichier inconnu
   org.jahia.engines.shared.fileNotModified.label                               
                                 = Le contenu de ce champ n'est pas modifiable
   org.jahia.engines.shared.Float_Field.valueMustBeNumber.label                 
                                 = La valeur doit être un nombre
  -org.jahia.engines.shared.Page_Field.changePageTemplate.label=<b>Modifier</b> 
le gabarit utilis&eacute; lors de la cr&eacute;ation de la page
  -org.jahia.engines.shared.Page_Field.choosePageOperations.label=Veuillez 
choisir l&#39;une des op&eacute;rations suivantes
  -org.jahia.engines.shared.Page_Field.multiLingualNB.label=Un titre de page 
est le seul &eacute;l&eacute;ment pouvant &ecirc;tre multilingue
  
-org.jahia.engines.shared.Page_Field.createLinkToExternalSite.label=Cr&eacute;er
 un <b>lien</b>
   org.jahia.engines.shared.Page_Field.accessDenied.label                       
                                                                                
  = L'acc&egrave;s &agrave; cette page a &eacute;t&eacute; refus&eacute;
   org.jahia.engines.shared.Page_Field.changePageTemplate.label                 
                                                                          = 
<b>Modifier</b> le chablon de la page existante
   org.jahia.engines.shared.Page_Field.choosePageOperations.label               
                                                                                
  = Veuillez choisir l'une des op&eacute;rations suivantes
  @@ -751,8 +747,8 @@
   org.jahia.engines.importexport.contentpick.condition1.and.label=tous ces mots
   org.jahia.engines.importexport.contentpick.condition1.exact.label=la phrase 
exacte
   org.jahia.engines.importexport.contentpick.condition1.or.label=au moins un 
de ces mots
  -org.jahia.engines.importexport.contentpick.criteria.add.label=ajoute un 
critre
  -org.jahia.engines.importexport.contentpick.criteria.remove.label=enlve un 
critre
  +org.jahia.engines.importexport.contentpick.criteria.add.label=ajoute un 
crit�re
  +org.jahia.engines.importexport.contentpick.criteria.remove.label=enl�ve un 
crit�re
   org.jahia.engines.importexport.contentpick.searchsite.all.label=sur tous les 
sites
   org.jahia.engines.importexport.contentpick.searchsite.onesite.label=sur le 
site
   org.jahia.engines.importexport.contentpick.condition.author.label=l'auteur
  @@ -788,4 +784,17 @@
   
org.jahia.engines.importexport.contentpick.condition.daterange.week.label=sur 
la semaine derniere
   
org.jahia.engines.importexport.contentpick.condition.daterange.months.label=les 
derniers 6 mois
   org.jahia.engines.importexport.contentpick.welcome.label1=Je cherche un 
objet de type
  -org.jahia.engines.importexport.contentpick.welcome.label2=avec
  \ No newline at end of file
  +org.jahia.engines.importexport.contentpick.welcome.label2=avec
  +
  +#MetaData
  +org.jahia.services.metadata.creator                              = 
Cr&eacute;ateur
  +org.jahia.services.metadata.lastContributor                      = Dernier 
contributeur
  +org.jahia.services.metadata.lastPublisher                        = Dernier 
validateur
  +org.jahia.services.metadata.creationDate                         = Date de 
cr&eacute;ation
  +org.jahia.services.metadata.lastModificationDate         = Date de 
derni&egrave;re modification
  +org.jahia.services.metadata.lastPublishingDate                       = Date 
de derni&egrave;re publication
  +org.jahia.services.metadata.description                              = 
Description
  +org.jahia.services.metadata.keywords                         = Mots 
cl&eacute;s
  +org.jahia.services.metadata.hiddenMetadata                       = 
M&eacute;ta donn&eacute;es cach&eacute;es
  +org.jahia.services.metadata.categories                               = 
Cat&eacute;gories
  +org.jahia.services.metadata.pagePath                         = Chemin de la 
page
  \ No newline at end of file
  
  
  
  Index: applicationcontext-metadata.xml
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/spring/applicationcontext-metadata.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- applicationcontext-metadata.xml   10 Nov 2005 10:31:38 -0000      1.19
  +++ applicationcontext-metadata.xml   28 Nov 2005 16:48:35 -0000      1.20
  @@ -99,8 +99,8 @@
        <!-- Field definition bean -->
        <bean id="fielddef.creator" 
class="org.jahia.services.metadata.FieldDefinition">
                <property name="name"><value>creator</value></property>
  -             <property name="title"><value>creator</value></property>
  -             <property name="type"><value>20</value></property> <!-- 
SMALLTEXT_SHARED_LANG -->
  +        <property name="title"><value><![CDATA[<jahia-resource 
id="JahiaEnginesResources" key="org.jahia.services.metadata.creator" 
default-value="Creator"/>]]></value></property>
  +        <property name="type"><value>20</value></property> <!-- 
SMALLTEXT_SHARED_LANG -->
                <property name="defaultValue"><value></value></property>
                <property name="readOnly"><value>true</value></property> <!-- 
not editable value -->
                <property 
name="editableDefinition"><value>false</value></property> <!-- not editable 
definition, as loaded from xml file -->
  @@ -116,7 +116,7 @@
        </bean>
        <bean id="fielddef.lastContributor" 
class="org.jahia.services.metadata.FieldDefinition">
                <property name="name"><value>lastContributor</value></property>
  -             <property name="title"><value>lastContributor</value></property>
  +             <property name="title"><value><![CDATA[<jahia-resource 
id="JahiaEnginesResources" key="org.jahia.services.metadata.lastContributor" 
default-value="Last contributor"/>]]></value></property>
                <property name="type"><value>20</value></property>
                <property name="defaultValue"><value></value></property>
                <property name="readOnly"><value>true</value></property>
  @@ -133,7 +133,7 @@
        </bean>
        <bean id="fielddef.lastPublisher" 
class="org.jahia.services.metadata.FieldDefinition">
                <property name="name"><value>lastPublisher</value></property>
  -             <property name="title"><value>lastPublisher</value></property>
  +             <property name="title"><value><![CDATA[<jahia-resource 
id="JahiaEnginesResources" key="org.jahia.services.metadata.lastPublisher" 
default-value="Last publisher"/>]]></value></property>
                <property name="type"><value>20</value></property> <!-- 
SMALLTEXT_SHARED_LANG -->
                <property name="defaultValue"><value></value></property>
                <property name="readOnly"><value>true</value></property>
  @@ -150,7 +150,7 @@
        </bean>
        <bean id="fielddef.creationDate" 
class="org.jahia.services.metadata.FieldDefinition">
                <property name="name"><value>creationDate</value></property>
  -             <property name="title"><value>creationDate</value></property>
  +             <property name="title"><value><![CDATA[<jahia-resource 
id="JahiaEnginesResources" key="org.jahia.services.metadata.creationDate" 
default-value="Creation date"/>]]></value></property>
                <property name="type"><value>4</value></property> <!-- DATE -->
                <property 
name="defaultValue"><value><![CDATA[<jahia_calendar[dd MMMM yyyy 
HH:mm]>]]></value></property>
                <property name="readOnly"><value>true</value></property>
  @@ -167,7 +167,7 @@
        </bean>
        <bean id="fielddef.lastModificationDate" 
class="org.jahia.services.metadata.FieldDefinition">
                <property 
name="name"><value>lastModificationDate</value></property>
  -             <property 
name="title"><value>lastModificationDate</value></property>
  +             <property name="title"><value><![CDATA[<jahia-resource 
id="JahiaEnginesResources" 
key="org.jahia.services.metadata.lastModificationDate" default-value="Last 
modification date"/>]]></value></property>
                <property name="type"><value>4</value></property>
                <property 
name="defaultValue"><value><![CDATA[<jahia_calendar[dd MMMM yyyy 
HH:mm]>]]></value></property>
                <property name="readOnly"><value>true</value></property>
  @@ -184,7 +184,7 @@
        </bean>
        <bean id="fielddef.lastPublishingDate" 
class="org.jahia.services.metadata.FieldDefinition">
                <property 
name="name"><value>lastPublishingDate</value></property>
  -             <property 
name="title"><value>lastPublishingDate</value></property>
  +             <property name="title"><value><![CDATA[<jahia-resource 
id="JahiaEnginesResources" key="org.jahia.services.metadata.lastPublishingDate" 
default-value="Last publishing date"/>]]></value></property>
                <property name="type"><value>4</value></property>
                <property 
name="defaultValue"><value><![CDATA[<jahia_calendar[dd MMMM yyyy 
HH:mm]>]]></value></property>
                <property name="readOnly"><value>true</value></property>
  @@ -201,7 +201,7 @@
        </bean>
        <bean id="fielddef.description" 
class="org.jahia.services.metadata.FieldDefinition">
                <property name="name"><value>description</value></property>
  -             <property name="title"><value>Description</value></property>
  +             <property name="title"><value><![CDATA[<jahia-resource 
id="JahiaEnginesResources" key="org.jahia.services.metadata.description" 
default-value="Description"/>]]></value></property>
                <property name="type"><value>3</value></property>
                <property name="defaultValue"><value></value></property>
                <property name="readOnly"><value>false</value></property>
  @@ -221,7 +221,7 @@
        </bean>
        <bean id="fielddef.keyword" 
class="org.jahia.services.metadata.FieldDefinition">
                <property name="name"><value>keywords</value></property>
  -             <property name="title"><value>Container 
Keyword</value></property>
  +             <property name="title"><value><![CDATA[<jahia-resource 
id="JahiaEnginesResources" key="org.jahia.services.metadata.keywords" 
default-value="Container keywords"/>]]></value></property>
                <property name="type"><value>20</value></property>
                <property name="defaultValue"><value></value></property>
                <property name="readOnly"><value>false</value></property>
  @@ -241,7 +241,7 @@
        </bean>
        <bean id="fielddef.hiddenMetadata" 
class="org.jahia.services.metadata.FieldDefinition">
                <property name="name"><value>hiddenMetadata</value></property>
  -             <property name="title"><value>Hidden Metadata</value></property>
  +             <property name="title"><value><![CDATA[<jahia-resource 
id="JahiaEnginesResources" key="org.jahia.services.metadata.hiddenMetadata" 
default-value="Hidden metadata"/>]]></value></property>
                <property name="type"><value>20</value></property>
                <property name="defaultValue"><value></value></property>
                <property name="readOnly"><value>false</value></property>
  @@ -270,7 +270,7 @@
               fundamentally false.
           -->
                <property name="name"><value>defaultCategory</value></property>
  -             <property name="title"><value>All categories</value></property>
  +             <property name="title"><value><![CDATA[<jahia-resource 
id="JahiaEnginesResources" key="org.jahia.services.metadata.categories" 
default-value="Categories"/>]]></value></property>
                <property name="type"><value>14</value></property>
                <!-- format for default value is 
[startKeyInCategoryTree]defaultSelectedKey1,defaultSelectedKey2,... -->
                <property name="defaultValue"><value>[root]</value></property>
  @@ -291,7 +291,7 @@
        </bean>
        <bean id="fielddef.pagePath" 
class="org.jahia.services.metadata.FieldDefinition">
                <property name="name"><value>pagePath</value></property>
  -             <property name="title"><value>Page Path</value></property>
  +             <property name="title"><value><![CDATA[<jahia-resource 
id="JahiaEnginesResources" key="org.jahia.services.metadata.pagePath" 
default-value="Page path"/>]]></value></property>
                <property name="type"><value>20</value></property>
                <property name="defaultValue"><value></value></property>
                <property name="readOnly"><value>true</value></property>

Reply via email to