Author: tdraier
Date: Mon Sep 24 14:11:55 2007
New Revision: 18627
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18627&repname=
=3Djahia
Log:
introduced resource bundle entry for "import file" (JAHIA-2328)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/importex=
port/import.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources.properties&rev=3D18627&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/JahiaEnginesResources.p=
roperties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties Mon Sep 24 14:11:55 2007
@@ -1537,6 +1537,7 @@
org.jahia.engines.importexport.import.definition =3D Definition not found =
for object {0} ({1}), in {2} (template {3}) ({4}, line {5})
org.jahia.engines.importexport.import.definitionInCtn =3D Definition not f=
ound for object {0} ({1}), in {2} (container {4} in template {3}) ({5}, lin=
e {6})
org.jahia.engines.importexport.import.languages =3D Languages do not match=
, {0} is not defined for this site.
+org.jahia.engines.importexport.import.importFile =3D Import file (XML or Z=
ip)
=
##process Display
org.jahia.engines.processDisplay.back =3D Back to Process
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_en.properties&rev=3D18627&=
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/JahiaEnginesResources_e=
n.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties Mon Sep 24 14:11:55 2007
@@ -1536,6 +1536,7 @@
org.jahia.engines.importexport.import.definition =3D Definition not found =
for object {0} ({1}), in {2} (template {3}) ({4}, line {5})
org.jahia.engines.importexport.import.definitionInCtn =3D Definition not f=
ound for object {0} ({1}), in {2} (container {4} in template {3}) ({5}, lin=
e {6})
org.jahia.engines.importexport.import.languages =3D Languages do not match=
, {0} is not defined for this site.
+org.jahia.engines.importexport.import.importFile =3D Import file (XML or Z=
ip)
=
##process Display
org.jahia.engines.processDisplay.label =3D Process
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_fr.properties&rev=3D18627&=
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/JahiaEnginesResources_f=
r.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties Mon Sep 24 14:11:55 2007
@@ -389,6 +389,8 @@
org.jahia.engines.importexport.import.template =3D Template non trouv=C3=
=A9e pour l''objet {0} : {1} ({2}, ligne {3})
org.jahia.engines.importexport.import.templateCompilation =3D La template =
{0} ne compile pas
org.jahia.engines.importexport.import.languages =3D Les langues ne corresp=
ondent pas, {0} n''est pas d=C3=A9fini pour ce site.
+org.jahia.engines.importexport.import.importFile =3D Fichier d'import (XML=
ou Zip)
+
org.jahia.engines.include.actionSelector.Authoring.label =3D =C3=89dition
org.jahia.engines.include.actionSelector.Categories.label =3D Cat=C3=A9gor=
ies
org.jahia.engines.include.actionSelector.ContentDefinition.label =3D D=C3=
=A9finition de contenu
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/im=
portexport/import.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/importexport/import.jsp&rev=3D186=
27&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/importex=
port/import.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/importex=
port/import.jsp Mon Sep 24 14:11:55 2007
@@ -52,7 +52,8 @@
<table>
<tr>
<td class=3D"t1">
- Import file (XML or Zip)
+ <jahia:engineResourceBundle
+ resourceName=3D"org.jahia.engines.importex=
port.import.importFile"/>
</td>
<td class=3D"t22">
<input class=3D"input" type=3D"file" name=3D"data"=
/>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
