Author: sshyrkov
Date: Fri Sep 7 12:07:32 2007
New Revision: 18391
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18391&repname=
=3Djahia
Log:
VOD-47: No "Source" Link on Linked Copies
http://www.jahia.net/jira/browse/VOD-47
Resolution: remove redundant message resources and use existing
Modified:
trunk/core/src/conf/java/JahiaEnginesResources.properties
trunk/core/src/conf/java/JahiaEnginesResources_de.properties
trunk/core/src/conf/java/JahiaEnginesResources_en.properties
trunk/core/src/conf/java/JahiaEnginesResources_fr.properties
trunk/core/src/webapp/jsp/jahia/engines/importexport/dispPickers.jsp
Modified: trunk/core/src/conf/java/JahiaEnginesResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources.properties&rev=3D18391&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
--- trunk/core/src/conf/java/JahiaEnginesResources.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources.properties Fri Sep 7 12=
:07:32 2007
@@ -1474,8 +1474,6 @@
org.jahia.engines.importexport.contentpick.resultmessage.label =3D please =
specify one or more keywords
org.jahia.engines.importexport.contentpick.postfix.author.label =3D is
org.jahia.engines.importexport.contentpick.postfix.keywords.label =3D are =
the following
-org.jahia.engines.importexport.contentpick.today.at =3D today at
-org.jahia.engines.importexport.contentpick.yesterday.at =3D yesterday at
org.jahia.engines.importexport.contentpick.welcome.label1 =3D I search a c=
ontent object of type
org.jahia.engines.importexport.contentpick.welcome.label2 =3D with
=
Modified: trunk/core/src/conf/java/JahiaEnginesResources_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources_de.properties&rev=3D18391&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
--- trunk/core/src/conf/java/JahiaEnginesResources_de.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_de.properties Fri Sep 7=
12:07:32 2007
@@ -924,8 +924,6 @@
org.jahia.engines.importexport.contentpick.resultmessage.label =3D Geben S=
ie mindestens ein Schl\u00FCsselwort ein.
org.jahia.engines.importexport.contentpick.postfix.author.label =3D ist
org.jahia.engines.importexport.contentpick.postfix.keywords.label =3D sind=
die folgenden
-org.jahia.engines.importexport.contentpick.today.at =3D Heute um
-org.jahia.engines.importexport.contentpick.yesterday.at =3D Gestern um
org.jahia.engines.importexport.contentpick.welcome.label1 =3D Ich suche na=
ch einem Content Objekt vom Typ
org.jahia.engines.importexport.contentpick.welcome.label2 =3D mit
=
Modified: trunk/core/src/conf/java/JahiaEnginesResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources_en.properties&rev=3D18391&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
--- trunk/core/src/conf/java/JahiaEnginesResources_en.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_en.properties Fri Sep 7=
12:07:32 2007
@@ -1482,8 +1482,6 @@
org.jahia.engines.importexport.contentpick.resultmessage.label =3D please =
specify one or more keywords
org.jahia.engines.importexport.contentpick.postfix.author.label =3D is
org.jahia.engines.importexport.contentpick.postfix.keywords.label =3D are =
the following
-org.jahia.engines.importexport.contentpick.today.at =3D today at
-org.jahia.engines.importexport.contentpick.yesterday.at =3D yesterday at
org.jahia.engines.importexport.contentpick.welcome.label1 =3D I search a c=
ontent object of type
org.jahia.engines.importexport.contentpick.welcome.label2 =3D with
=
Modified: trunk/core/src/conf/java/JahiaEnginesResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources_fr.properties&rev=3D18391&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
--- trunk/core/src/conf/java/JahiaEnginesResources_fr.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_fr.properties Fri Sep 7=
12:07:32 2007
@@ -434,8 +434,6 @@
org.jahia.engines.importexport.contentpick.searchsite.all.label =3D sur to=
us les sites
org.jahia.engines.importexport.contentpick.searchsite.allpos.label =3D sur
org.jahia.engines.importexport.contentpick.searchsite.onesite.label =3D su=
r le site
-org.jahia.engines.importexport.contentpick.today.at =3D aujourd'hui =C3=A0
-org.jahia.engines.importexport.contentpick.yesterday.at =3D hier =C3=A0
org.jahia.engines.importexport.contentpick.welcome.label1 =3D Je cherche u=
n objet de contenu de type
org.jahia.engines.importexport.contentpick.welcome.label2 =3D avec
org.jahia.engines.importexport.export.Differential.label =3D Diff=C3=A9ren=
tiel
Modified: trunk/core/src/webapp/jsp/jahia/engines/importexport/dispPickers.=
jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/importexport/dispPickers.jsp&rev=3D18391&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
--- trunk/core/src/webapp/jsp/jahia/engines/importexport/dispPickers.jsp (o=
riginal)
+++ trunk/core/src/webapp/jsp/jahia/engines/importexport/dispPickers.jsp Fr=
i Sep 7 12:07:32 2007
@@ -260,9 +260,9 @@
Calendar c =3D Calendar.getInstance(l);
c.setTime(new Date(d));
if (c.after(now)) {
- return getRessource(enginebundle, ".today.at") + "&nbs=
p;" + sd.format(new Date(d));
+ return getRessource(enginebundle, "org.jahia.time.toda=
y.prefix", "") + " " + sd.format(new Date(d));
} else if (c.after(hier) && c.before(now)) {
- return getRessource(enginebundle, ".yesterday.at") + "=
" + sd.format(new Date(d));
+ return getRessource(enginebundle, "org.jahia.time.yest=
erday.prefix", "") + " " + sd.format(new Date(d));
}
=
s =3D df.format(new Date(d));
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
