svnno****@sourc*****
svnno****@sourc*****
2007年 5月 27日 (日) 08:16:57 JST
Revision: 162 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=162 Author: shinsuke Date: 2007-05-27 08:16:57 +0900 (Sun, 27 May 2007) Log Message: ----------- i18ned messages. Modified Paths: -------------- pal-portal/trunk/build.properties pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm Added Paths: ----------- pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/ pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties -------------- next part -------------- Modified: pal-portal/trunk/build.properties =================================================================== --- pal-portal/trunk/build.properties 2007-05-26 23:15:42 UTC (rev 161) +++ pal-portal/trunk/build.properties 2007-05-26 23:16:57 UTC (rev 162) @@ -170,6 +170,9 @@ applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java,\ applications/j2-admin/src/webapp/WEB-INF/portlet.xml,\ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java,\ +layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties,\ +layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties,\ +layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties,\ layout-portlets/src/webapp/WEB-INF/portlet.xml,\ src/webapp/WEB-INF/assembly/jetspeed-services.xml,\ src/webapp/WEB-INF/assembly/portal-url-generation.xml,\ @@ -190,21 +193,17 @@ portal.delete.files=\ src/webapp/WEB-INF/conf/override.properties,\ -src/webapp/decorations/images/edit.gif,\ -src/webapp/decorations/images/view.gif,\ -src/webapp/decorations/images/help.gif,\ - - portal.delete.directories=\ src/webapp/WEB-INF/pages/,\ src/webapp/desktop-themes/sky/,\ applications/j2-admin/src/webapp/WEB-INF/view/userreg/email,\ +src/webapp/decorations/layout/jetspeed/,\ +src/webapp/decorations/layout/jscookmenu/,\ + src/webapp/decorations/layout/blueocean/,\ src/webapp/decorations/layout/sunflower/,\ -src/webapp/decorations/layout/jetspeed/,\ src/webapp/decorations/layout/thesolution/,\ -src/webapp/decorations/layout/jscookmenu/,\ src/webapp/decorations/layout/tigris/ Added: pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties =================================================================== --- pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties 2007-05-26 23:15:42 UTC (rev 161) +++ pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties 2007-05-26 23:16:57 UTC (rev 162) @@ -0,0 +1,23 @@ +Index: layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties +=================================================================== +--- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties (リビジョン 539124) ++++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties (作業コピー) +@@ -103,4 +103,18 @@ + portal.folder.editing.deleteFolder=Delete + portal.folder.editing.confirmDeleteThisFolder=Do you want to delete this folder? + ++portal.preference.window.title=Preferences ++portal.preference.pageproperties.title=Page Properties ++portal.preference.addpage.title=Add Page ++portal.preference.folderproperties.title=Folder Properties ++portal.preference.addfolder.title=Add Folder ++portal.preference.changelayout.title=Change Layout ++portal.preference.addlayout.title=Add Layout ++portal.preference.changetheme.title=Change Theme ++portal.page.position=Page Position ++portal.page.delete=Delete Page ++portal.folder.position=Folder Position ++portal.folder.delete=Delete Folder ++portal.preference.window.close=Close ++portal.preference.show.preference=Show Preference + Property changes on: pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties =================================================================== --- pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties 2007-05-26 23:15:42 UTC (rev 161) +++ pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties 2007-05-26 23:16:57 UTC (rev 162) @@ -0,0 +1,23 @@ +Index: layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties +=================================================================== +--- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties (リビジョン 539124) ++++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties (作業コピー) +@@ -103,4 +103,18 @@ + portal.folder.editing.deleteFolder=Delete + portal.folder.editing.confirmDeleteThisFolder=Do you want to delete this folder? + ++portal.preference.window.title=Preferences ++portal.preference.pageproperties.title=Page Properties ++portal.preference.addpage.title=Add Page ++portal.preference.folderproperties.title=Folder Properties ++portal.preference.addfolder.title=Add Folder ++portal.preference.changelayout.title=Change Layout ++portal.preference.addlayout.title=Add Layout ++portal.preference.changetheme.title=Change Theme ++portal.page.position=Page Position ++portal.page.delete=Delete Page ++portal.folder.position=Folder Position ++portal.folder.delete=Delete Folder ++portal.preference.window.close=Close ++portal.preference.show.preference=Show Preference + Property changes on: pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties =================================================================== --- pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties 2007-05-26 23:15:42 UTC (rev 161) +++ pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties 2007-05-26 23:16:57 UTC (rev 162) @@ -0,0 +1,22 @@ +Index: layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties +=================================================================== +--- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties (リビジョン 539124) ++++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties (作業コピー) +@@ -103,3 +103,17 @@ + portal.folder.editing.deleteFolder=\u524a\u9664 + portal.folder.editing.confirmDeleteThisFolder=\u3053\u306e\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b? + ++portal.preference.window.title=\u8a2d\u5b9a ++portal.preference.pageproperties.title=\u30da\u30fc\u30b8\u30d7\u30ed\u30d1\u30c6\u30a3 ++portal.preference.addpage.title=\u30da\u30fc\u30b8\u306e\u8ffd\u52a0 ++portal.preference.folderproperties.title=\u30d5\u30a9\u30eb\u30c0\u30d7\u30ed\u30d1\u30c6\u30a3 ++portal.preference.addfolder.title=\u30d5\u30a9\u30eb\u30c0\u306e\u8ffd\u52a0 ++portal.preference.changelayout.title=\u30ec\u30a4\u30a2\u30a6\u30c8\u306e\u5909\u66f4 ++portal.preference.addlayout.title=\u30ec\u30a4\u30a2\u30a6\u30c8\u306e\u8ffd\u52a0 ++portal.preference.changetheme.title=\u30c6\u30fc\u30de\u306e\u5909\u66f4 ++portal.page.position=\u30da\u30fc\u30b8\u4f4d\u7f6e ++portal.page.delete=\u30da\u30fc\u30b8\u306e\u524a\u9664 ++portal.folder.position=\u30d5\u30a9\u30eb\u30c0\u4f4d\u7f6e ++portal.folder.delete=\u30d5\u30a9\u30eb\u30c0\u306e\u524a\u9664 ++portal.preference.window.close=\u9589\u3058\u308b ++portal.preference.show.preference=\u8a2d\u5b9a\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u8868\u793a Property changes on: pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm =================================================================== --- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm 2007-05-26 23:15:42 UTC (rev 161) +++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm 2007-05-26 23:16:57 UTC (rev 162) @@ -14,7 +14,7 @@ + #set($_actions = $layoutDecoration.actions) + <div id="portal-page-actions" > + #if($_actions.size() >0) -+ <a id="${namespace}PreferenceWindowLink" href="javascript:${namespace}ShowPreferenceWindow();" class="action pageAction" style="display:none;"><img src="$request.contextPath/decorations/images/edit.gif" alt="Preference" border="0">Show Preference</a> ++ <a id="${namespace}PreferenceWindowLink" href="javascript:${namespace}ShowPreferenceWindow();" class="action pageAction" style="display:none;"><img src="$request.contextPath/decorations/images/edit.gif" alt="$messages.getString("portal.preference.show.preference")" border="0">$messages.getString("portal.preference.show.preference")</a> + #if($allowAddPortlet) +#set ($chooser = "${jetspeed.basePath}/system/customizer/selector.psml?jspage=${profiledPage}&jslayoutid=$myFragment.id") + <a href="$response.encodeURL($chooser)" class="action pageAction"><img src="#GetPageResource('images/select.gif')" border="0" title="$messages.getString("portal.page.editing.addportlet")"/>$messages.getString("portal.page.editing.addportlet")</a> Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm =================================================================== --- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm 2007-05-26 23:15:42 UTC (rev 161) +++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm 2007-05-26 23:16:57 UTC (rev 162) @@ -43,7 +43,7 @@ #if($isRoot) #getBoolProperty($allowChangePageTheme $rootDecorator "allow.change.page.theme" true) #getBoolProperty($allowAddPage $rootDecorator "allow.add.page" true) -@@ -89,68 +90,321 @@ +@@ -89,68 +90,316 @@ #end #getBoolProperty($allowChangeLayout $rootDecorator "allow.change.layout" true) @@ -84,7 +84,7 @@ +#* Preferences *# + <div id="${namespace}PreferenceWindow" style="z-index:10000;border-left:1px solid #999999;border-top:1px solid #999999;border-bottom:4px solid #999999;border-right:4px solid #999999;width:650px;height:450px;position:absolute;top:30px;left:30px;background-color:#efefde;"> + <div style="z-index:10010;position:absolute;top:5px;left:10px;width:150px;height:380px;"> -+ <span style="font-family:sans-serif;font-size:11pt;">Preferences</span> ++ <span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.window.title")</span> + </div> + <div style="z-index:10010;border:1px solid #999999;position:absolute;top:30px;left:10px;width:150px;height:380px;background-color:#ffffff;"> +<script language="JavaScript"><!-- @@ -92,49 +92,49 @@ + if(id=="${namespace}PageProperties"){ + document.getElementById("${namespace}PageProperties").style.display="block"; + document.getElementById("${namespace}PreferenceName").value=id; -+ document.getElementById("${namespace}PreferenceTitle").innerHTML="Page Properties"; ++ document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.pageproperties.title")"; + }else{ + document.getElementById("${namespace}PageProperties").style.display="none"; + } + if(id=="${namespace}AddPage"){ + document.getElementById("${namespace}AddPage").style.display="block"; + document.getElementById("${namespace}PreferenceName").value=id; -+ document.getElementById("${namespace}PreferenceTitle").innerHTML="Add Page"; ++ document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addpage.title")"; + }else{ + document.getElementById("${namespace}AddPage").style.display="none"; + } + if(id=="${namespace}FolderProperties"){ + document.getElementById("${namespace}FolderProperties").style.display="block"; + document.getElementById("${namespace}PreferenceName").value=id; -+ document.getElementById("${namespace}PreferenceTitle").innerHTML="Folder Properties"; ++ document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.folderproperties.title")"; + }else{ + document.getElementById("${namespace}FolderProperties").style.display="none"; + } + if(id=="${namespace}AddFolder"){ + document.getElementById("${namespace}AddFolder").style.display="block"; + document.getElementById("${namespace}PreferenceName").value=id; -+ document.getElementById("${namespace}PreferenceTitle").innerHTML="Add Folder"; ++ document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addfolder.title")"; + }else{ + document.getElementById("${namespace}AddFolder").style.display="none"; + } + if(id=="${namespace}ChangeLayout"){ + document.getElementById("${namespace}ChangeLayout").style.display="block"; + document.getElementById("${namespace}PreferenceName").value=id; -+ document.getElementById("${namespace}PreferenceTitle").innerHTML="Change Layout"; ++ document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.changelayout.title")"; + }else{ + document.getElementById("${namespace}ChangeLayout").style.display="none"; + } + if(id=="${namespace}AddLayout"){ + document.getElementById("${namespace}AddLayout").style.display="block"; + document.getElementById("${namespace}PreferenceName").value=id; -+ document.getElementById("${namespace}PreferenceTitle").innerHTML="Add Layout"; ++ document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.addlayout.title")"; + }else{ + document.getElementById("${namespace}AddLayout").style.display="none"; + } + if(id=="${namespace}ChangeTheme"){ + document.getElementById("${namespace}ChangeTheme").style.display="block"; + document.getElementById("${namespace}PreferenceName").value=id; -+ document.getElementById("${namespace}PreferenceTitle").innerHTML="Change Theme"; ++ document.getElementById("${namespace}PreferenceTitle").innerHTML="$messages.getString("portal.preference.changetheme.title")"; + }else{ + document.getElementById("${namespace}ChangeTheme").style.display="none"; + } @@ -152,25 +152,25 @@ +// --></script> +#* Menu *# + <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;"> -+ <a href="javascript:${namespace}UpdatePreference('${namespace}PageProperties');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">Page Properties</span></a> ++ <a href="javascript:${namespace}UpdatePreference('${namespace}PageProperties');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.pageproperties.title")</span></a> + </div> + <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;"> -+ <a href="javascript:${namespace}UpdatePreference('${namespace}AddPage');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">Add Page</span></a> ++ <a href="javascript:${namespace}UpdatePreference('${namespace}AddPage');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addpage.title")</span></a> + </div> + <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;"> -+ <a href="javascript:${namespace}UpdatePreference('${namespace}FolderProperties');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">Folder Properties</span></a> ++ <a href="javascript:${namespace}UpdatePreference('${namespace}FolderProperties');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.folderproperties.title")</span></a> + </div> + <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;"> -+ <a href="javascript:${namespace}UpdatePreference('${namespace}AddFolder');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">Add Folder</span></a> ++ <a href="javascript:${namespace}UpdatePreference('${namespace}AddFolder');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addfolder.title")</span></a> + </div> + <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;"> -+ <a href="javascript:${namespace}UpdatePreference('${namespace}ChangeLayout');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">Change Layout</span></a> ++ <a href="javascript:${namespace}UpdatePreference('${namespace}ChangeLayout');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.changelayout.title")</span></a> + </div> + <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;"> -+ <a href="javascript:${namespace}UpdatePreference('${namespace}AddLayout');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">Add Layout</span></a> ++ <a href="javascript:${namespace}UpdatePreference('${namespace}AddLayout');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.addlayout.title")</span></a> + </div> + <div style="z-index:10020;width:150px;height:25px;vertical-align:middle;"> -+ <a href="javascript:${namespace}UpdatePreference('${namespace}ChangeTheme');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">Change Theme</span></a> ++ <a href="javascript:${namespace}UpdatePreference('${namespace}ChangeTheme');" style="margin-left:3px;text-decoration:none;"><span style="font-family:sans-serif;font-size:11pt;">$messages.getString("portal.preference.changetheme.title")</span></a> + </div> + </div> + <div style="z-index:10010;border:1px solid #999999;position:absolute;top:30px;left:170px;width:470px;height:380px;background-color:#ffffff;"> @@ -211,7 +211,7 @@ +<br/> +#if($allowNavigatePage) + <fieldset> -+ <legend>Page Navigation</legend> ++ <legend>$messages.getString("portal.page.position")</legend> + <div> + <label>$messages.getString("portal.page.editing.pagenavigation")</label> + <input id="move-page-left" type="submit" name="jsMovePageLeft" value="$messages.getString("portal.page.editing.movePageLeft")" /> @@ -222,7 +222,7 @@ +<br/> +#if($allowDeletePage) + <fieldset> -+ <legend>Delete Page</legend> ++ <legend>$messages.getString("portal.page.delete")</legend> + <div> + <label for="deletepage">$messages.getString("portal.page.editing.deleteThisPage")</label> + <input id="deletepage" type="submit" name="jsDeletePage" value="$messages.getString("portal.page.editing.deletePage")" onclick="if(window.confirm('$messages.getString("portal.page.editing.confirmDeleteThisPage")')){return true;}return false;"/> @@ -286,7 +286,7 @@ +<br/> +#if($allowNavigateFolder) + <fieldset> -+ <legend>Folder Navigation</legend> ++ <legend>$messages.getString("portal.folder.position")</legend> + <div> + <label>$messages.getString("portal.folder.editing.foldernavigation")</label> + <input id="move-folder-left" type="submit" name="jsMoveFolderLeft" value="$messages.getString("portal.folder.editing.moveFolderLeft")" /> @@ -297,7 +297,7 @@ +<br/> +#if($allowDeleteFolder) + <fieldset> -+ <legend>Delete Folder</legend> ++ <legend>$messages.getString("portal.folder.delete")</legend> + <div> + <label for="deletefolder">$messages.getString("portal.folder.editing.deleteThisFolder")</label> + <input id="deletefolder" type="submit" name="jsDeleteFolder" value="$messages.getString("portal.folder.editing.deleteFolder")" onclick="if(window.confirm('$messages.getString("portal.folder.editing.confirmDeleteThisFolder")')){return true;}return false;"/> @@ -351,11 +351,6 @@ + </select> + <input type="submit" name="jsChangeLayout" value="$messages.getString("portal.page.editing.changelayout")" /> + </fieldset> -+<br/> -+ <fieldset> -+ <legend>Portlet Layout</legend> -+ <input type="button" onclick="${namespace}HidePreferenceWindow();" value="Change Portlet Layout" /> -+ </fieldset> + </div> +#end + @@ -413,7 +408,7 @@ <select id="decorators" name="decorators"> <option value=''> #foreach($pd in $decorationFactory.getPortletDecorations($rc)) -@@ -158,112 +412,40 @@ +@@ -158,112 +407,41 @@ #end </select> <input type="submit" name="jsSubmitTheme" value="$messages.getString("portal.page.editing.changethemeall")"/> @@ -543,10 +538,11 @@ - <br style="clear:both;"> - </form> + <div style="z-index:10010;position:absolute;top:415px;left:10px;width:630px;height:30px;text-align:right;"> ++ <input type="button" onclick="${namespace}HidePreferenceWindow();" value="$messages.getString("portal.preference.window.close")" style="font-family:sans-serif;font-size:11pt;height:25px;"/> +#set($_actions = $layoutDecoration.actions) + #if($_actions.size() >0) + #foreach ($_action in $_actions) -+ <input type="button" onClick="location.href='${_action.Action}'" name="close" value="${_action.Name}" style="font-family:sans-serif;font-size:11pt;height:25px;"/> ++ <input type="button" onclick="location.href='${_action.Action}'" value="${_action.Name}" style="font-family:sans-serif;font-size:11pt;height:25px;"/> + #end + #end + </div>