Author: knguyen
Date: Wed Jun 6 16:42:48 2007
New Revision: 17470
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17470&repname=
=3Djahia
Log:
internalization of the compare version screen
Modified:
trunk/core/src/conf/java/JahiaEnginesResources.properties
trunk/core/src/conf/java/JahiaEnginesResources_en.properties
trunk/core/src/conf/java/JahiaEnginesResources_fr.properties
trunk/core/src/webapp/views/engines/versioning/container/compare_versio=
n.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=3D17470&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 Wed Jun 6 16=
:42:48 2007
@@ -1154,15 +1154,20 @@
org.jahia.engines.version.from =3D From
org.jahia.engines.version.ignoreRevisionDateSelection =3D Ignore revision =
date selection
org.jahia.engines.version.languageToRestore =3D Languages to restore
+org.jahia.engines.version.lastContributorUnknown =3D unknown
+org.jahia.engines.version.lastModifiedAt =3D at
+org.jahia.engines.version.lastModifiedBy =3D last modified by
org.jahia.engines.version.legend =3D Legend
org.jahia.engines.version.level =3D Level
org.jahia.engines.version.levels =3D Levels
org.jahia.engines.version.liveVersion =3D live
org.jahia.engines.version.mergedDifference =3D Merged difference
+org.jahia.engines.version.newVersion =3D New version
org.jahia.engines.version.nbOfRevisions =3D Nb of revisions
org.jahia.engines.version.objectDescription =3D Object description
org.jahia.engines.version.objectTitle =3D Object title
org.jahia.engines.version.objectType =3D Object type
+org.jahia.engines.version.oldVersion =3D Old version
org.jahia.engines.version.operations =3D Operations
org.jahia.engines.version.pagerevisiontype.1 =3D Page attributes update
org.jahia.engines.version.pagerevisiontype.2 =3D Content update
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=3D17470&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 Wed Jun 6=
16:42:48 2007
@@ -1154,15 +1154,20 @@
org.jahia.engines.version.from =3D From
org.jahia.engines.version.ignoreRevisionDateSelection =3D Ignore revision =
date selection
org.jahia.engines.version.languageToRestore =3D Languages to restore
+org.jahia.engines.version.lastContributorUnknown =3D unknown
+org.jahia.engines.version.lastModifiedAt =3D at
+org.jahia.engines.version.lastModifiedBy =3D last modified by
org.jahia.engines.version.legend =3D Legend
org.jahia.engines.version.level =3D Level
org.jahia.engines.version.levels =3D Levels
org.jahia.engines.version.liveVersion =3D live
org.jahia.engines.version.mergedDifference =3D Merged difference
+org.jahia.engines.version.newVersion =3D New version
org.jahia.engines.version.nbOfRevisions =3D Nb of revisions
org.jahia.engines.version.objectDescription =3D Object description
org.jahia.engines.version.objectTitle =3D Object title
org.jahia.engines.version.objectType =3D Object type
+org.jahia.engines.version.oldVersion =3D Old version
org.jahia.engines.version.operations =3D Operations
org.jahia.engines.version.pagerevisiontype.1 =3D Page attributes update
org.jahia.engines.version.pagerevisiontype.2 =3D Content update
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=3D17470&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 Wed Jun 6=
16:42:48 2007
@@ -931,15 +931,20 @@
org.jahia.engines.version.ignoreRevisionDateSelection =3D Ignorer la s=C3=
=A9lection de la date de r=C3=A9vision
org.jahia.engines.version.ignoreRevisionDateSelection =3D Ne pas tenir com=
pte de la s=C3=A9lection
org.jahia.engines.version.languageToRestore =3D Langues =C3=A0 restaurer
+org.jahia.engines.version.lastContributorUnknown =3D unknown
+org.jahia.engines.version.lastModifiedAt =3D le
+org.jahia.engines.version.lastModifiedBy =3D modifi=C3=A9 par
org.jahia.engines.version.legend =3D L=C3=A9gende
org.jahia.engines.version.level =3D Niveau
org.jahia.engines.version.levels =3D Niveaux
org.jahia.engines.version.liveVersion =3D en ligne
+org.jahia.engines.version.newVersion =3D Nouvelle version
org.jahia.engines.version.mergedDifference =3D Difference
org.jahia.engines.version.nbOfRevisions =3D Nb de r=C3=A9visions
org.jahia.engines.version.objectDescription =3D Description
org.jahia.engines.version.objectTitle =3D Titre de l'objet
org.jahia.engines.version.objectType =3D Type de l'objet
+org.jahia.engines.version.oldVersion =3D Ancienne version
org.jahia.engines.version.operations =3D Op=C3=A9rations
org.jahia.engines.version.pagerevisiontype.1 =3D Mettre =C3=A0 jour attrib=
uts de page
org.jahia.engines.version.pagerevisiontype.2 =3D Mettre =C3=A0 jour le con=
tenu
Modified: trunk/core/src/webapp/views/engines/versioning/container/compare_=
version.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/views/engines/versioning/container/compare_version.jsp&rev=3D17470&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/views/engines/versioning/container/compare_versio=
n.jsp (original)
+++ trunk/core/src/webapp/views/engines/versioning/container/compare_versio=
n.jsp Wed Jun 6 16:42:48 2007
@@ -85,42 +85,6 @@
.getEngineResource( "org.jahia.engines.version.changed", jPara=
ms, jParams.getLocale(),"changed"));
=
%>
-<div class=3D"content" style=3D"width:100%;margin:0px 0px 0px 0px;padding:=
0px 0px 0px 0px;">
-<%
- if ( containerCompareBean.isCompareMode() ){
-%>
-<table border=3D"0" cellpadding=3D"5" cellspacing=3D"0" width=3D"80%">
-<tr>
- <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.versioning.oldVersion.label" defaultValue=3D=
"Old version"/></td>
- <td valign=3D"top" align=3D"left">:</td>
- <td valign=3D"top" align=3D"left" width=3D"100%"><%=3DRevisionEntrySet.g=
etVersionNumber(containerCompareBean.getOldRevision(), jParams, jParams.get=
Locale())%>, <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.=
versioning.lastModifiedBy.label" defaultValue=3D"last modified by"/> <=
%=3DRevisionEntrySet.getLastContributor(containerCompareBean.getOldRevision=
(), jParams, jParams.getLocale(),"org.jahia.engines.versioning.lastContribu=
torUnknown.label","unknown")%> <jahia:engineResourceBundle resourceNam=
e=3D"org.jahia.engines.versioning.lastModifiedAt.label" defaultValue=3D"at"=
/> <%=3DRevisionEntrySet.getVersionDate(containerCompareBean.getOldRev=
ision(), jParams.getLocale())%></td>
-</tr>
-<tr>
- <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.versioning.newVersion.label" defaultValue=3D=
"New version"/></td>
- <td valign=3D"top" align=3D"left">:</td>
- <td valign=3D"top" align=3D"left"><%=3DRevisionEntrySet.getVersionNumber=
(containerCompareBean.getNewRevision(), jParams, jParams.getLocale())%>, <j=
ahia:engineResourceBundle resourceName=3D"org.jahia.engines.versioning.last=
ModifiedBy.label" defaultValue=3D"last modified by"/> <%=3DRevisionEnt=
rySet.getLastContributor(containerCompareBean.getNewRevision(), jParams, jP=
arams.getLocale(),"org.jahia.engines.versioning.lastContributorUnknown.labe=
l","unknown")%> <jahia:engineResourceBundle resourceName=3D"org.jahia.=
engines.versioning.lastModifiedAt.label" defaultValue=3D"at"/> <%=3DRe=
visionEntrySet.getVersionDate(containerCompareBean.getNewRevision(), jParam=
s.getLocale())%></td>
-</tr>
-<tr>
- <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.versioning.differenceLegend" defaultValue=3D=
"Legend"/></td>
- <td valign=3D"top" align=3D"left">:</td>
- <td valign=3D"top" align=3D"left" nowrap>
- <%=3DaddedLegend%> | <%=3DdeletedLegend%> | <%=3Du=
pdatedLegend%>
- </td>
-</tr>
-</table>
-<% } else { =
- RevisionEntrySet revisionEntrySet =3D containerCompareBean.getActiveRevi=
sion();
-%>
-<table border=3D"0" cellpadding=3D"5" cellspacing=3D"0" width=3D"80%">
-<tr>
- <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.versioning.version.label" defaultValue=3D"Ve=
rsion"/></td>
- <td valign=3D"top" align=3D"left">:</td>
- <td valign=3D"top" align=3D"left" width=3D"100%"><%=3DRevisionEntrySet.g=
etVersionNumber(revisionEntrySet, jParams, jParams.getLocale())%>, <jahia:e=
ngineResourceBundle resourceName=3D"org.jahia.engines.versioning.lastModifi=
edBy.label" defaultValue=3D"last modified by"/> <%=3DRevisionEntrySet.=
getLastContributor(revisionEntrySet, jParams, jParams.getLocale(),"org.jahi=
a.engines.versioning.lastContributorUnknown.label","unknown")%> <jahia=
:engineResourceBundle resourceName=3D"org.jahia.engines.versioning.lastModi=
fiedAt.label" defaultValue=3D"at"/> <%=3DRevisionEntrySet.getVersionDa=
te(revisionEntrySet, jParams.getLocale())%></td>
-</tr>
-</table>
-<% } %>
-
-<div id=3D"fieldDiffsContainer">
<script language=3D"JavaScript">
<!-- =
=
@@ -185,6 +149,43 @@
AjxCore.addOnloadListener(launchContainerCompare);
//-->
</script>
+
+<div class=3D"content" style=3D"width:100%;margin:0px 0px 0px 0px;padding:=
0px 0px 0px 0px;">
+<%
+ if ( containerCompareBean.isCompareMode() ){
+%>
+<table border=3D"0" cellpadding=3D"5" cellspacing=3D"0" width=3D"80%">
+<tr>
+ <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.version.oldVersion" defaultValue=3D"Old vers=
ion"/></td>
+ <td valign=3D"top" align=3D"left">:</td>
+ <td valign=3D"top" align=3D"left" width=3D"100%"><%=3DRevisionEntrySet.g=
etVersionNumber(containerCompareBean.getOldRevision(), jParams, jParams.get=
Locale())%>, <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.=
version.lastModifiedBy" defaultValue=3D"last modified by"/> <%=3DRevis=
ionEntrySet.getLastContributor(containerCompareBean.getOldRevision(), jPara=
ms, jParams.getLocale(),"org.jahia.engines.version.lastContributorUnknown",=
"unknown")%> <jahia:engineResourceBundle resourceName=3D"org.jahia.eng=
ines.version.lastModifiedAt.label" defaultValue=3D"at"/> <%=3DRevision=
EntrySet.getVersionDate(containerCompareBean.getOldRevision(), jParams.getL=
ocale())%></td>
+</tr>
+<tr>
+ <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.version.newVersion" defaultValue=3D"New vers=
ion"/></td>
+ <td valign=3D"top" align=3D"left">:</td>
+ <td valign=3D"top" align=3D"left"><%=3DRevisionEntrySet.getVersionNumber=
(containerCompareBean.getNewRevision(), jParams, jParams.getLocale())%>, <j=
ahia:engineResourceBundle resourceName=3D"org.jahia.engines.version.lastMod=
ifiedBy" defaultValue=3D"last modified by"/> <%=3DRevisionEntrySet.get=
LastContributor(containerCompareBean.getNewRevision(), jParams, jParams.get=
Locale(),"org.jahia.engines.version.lastContributorUnknown","unknown")%>&nb=
sp;<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.version.la=
stModifiedAt" defaultValue=3D"at"/> <%=3DRevisionEntrySet.getVersionDa=
te(containerCompareBean.getNewRevision(), jParams.getLocale())%></td>
+</tr>
+<tr>
+ <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.version.legend" defaultValue=3D"Legend"/></t=
d>
+ <td valign=3D"top" align=3D"left">:</td>
+ <td valign=3D"top" align=3D"left" nowrap>
+ <%=3DaddedLegend%> | <%=3DdeletedLegend%> | <%=3Du=
pdatedLegend%>
+ </td>
+</tr>
+</table>
+<% } else { =
+ RevisionEntrySet revisionEntrySet =3D containerCompareBean.getActiveRevi=
sion();
+%>
+<table border=3D"0" cellpadding=3D"5" cellspacing=3D"0" width=3D"80%">
+<tr>
+ <td valign=3D"top" align=3D"left" nowrap><jahia:engineResourceBundle res=
ourceName=3D"org.jahia.engines.version.version" defaultValue=3D"Version"/><=
/td>
+ <td valign=3D"top" align=3D"left">:</td>
+ <td valign=3D"top" align=3D"left" width=3D"100%"><%=3DRevisionEntrySet.g=
etVersionNumber(revisionEntrySet, jParams, jParams.getLocale())%>, <jahia:e=
ngineResourceBundle resourceName=3D"org.jahia.engines.version.lastModifiedB=
y" defaultValue=3D"last modified by"/> <%=3DRevisionEntrySet.getLastCo=
ntributor(revisionEntrySet, jParams, jParams.getLocale(),"org.jahia.engines=
.version.lastContributorUnknown","unknown")%> <jahia:engineResourceBun=
dle resourceName=3D"org.jahia.engines.version.lastModifiedAt" defaultValue=
=3D"at"/> <%=3DRevisionEntrySet.getVersionDate(revisionEntrySet, jPara=
ms.getLocale())%></td>
+</tr>
+</table>
+<% } %>
+
+<div id=3D"fieldDiffsContainer">
</div>
</div>
<div class=3D"clearing"> </div>
\ No newline at end of file
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
