From 051b54a53c293d45f642c384957698593aa809bb Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Wed, 14 Oct 2009 10:50:14 +0000 Subject: [PATCH] Merged V3.2 to HEAD 15504: ETHREOH-2447: My Content page localisation failing - Localization is provided for all the ftl and xml files in WEB-INF\classes\alfresco\templates\webscripts\org\alfresco\portlets. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16907 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/portlets.properties | 83 +++++++++++++++++++ config/alfresco/messages/webclient.properties | 20 +++++ config/alfresco/portlets-context.xml | 16 ++++ .../client/doclist_preview_panel.ftl | 22 ++--- .../client/myspaces_preview_panel.ftl | 30 +++---- .../client/portlet_node_summary_panel.ftl | 24 +++--- .../templates/client/task_resource_panel.ftl | 2 +- .../templates/client/task_summary_panel.ftl | 20 ++--- .../alfresco/web/bean/ajax/TaskInfoBean.java | 2 + source/web/scripts/ajax/doclist.js | 8 +- source/web/scripts/ajax/myspaces.js | 8 +- source/web/scripts/ajax/mytasks.js | 2 +- 12 files changed, 179 insertions(+), 58 deletions(-) create mode 100755 config/alfresco/messages/portlets.properties create mode 100755 config/alfresco/portlets-context.xml diff --git a/config/alfresco/messages/portlets.properties b/config/alfresco/messages/portlets.properties new file mode 100755 index 0000000000..f7a2202b52 --- /dev/null +++ b/config/alfresco/messages/portlets.properties @@ -0,0 +1,83 @@ +portlets.refresh=Refresh +portlets.button.ok=OK +portlets.button.cancel=Cancel + +portlets.error.data_currently_unavailable=Sorry, data currently unavailable. +portlets.preview_currently_unavailable=Sorry, preview currently unavailable. + +portlets.message.showing=Showing +portlets.message.items=item(s) +portlets.message.showing_items=Showing {0} items + +portlets.doclist.all_items=All Items +portlets.doclist.word_documents=Word Documents +portlets.doclist.html_documents=HTML Documents +portlets.doclist.pdf_documents=PDF Documents +portlets.doclist.recently_modified=Recently Modified + +portlets.panel.description=Description +portlets.panel.modified=Modified +portlets.panel.modified_by=Modified By +portlets.panel.created=Created +portlets.panel.created_by=Created By +portlets.panel.size=Size +portlets.panel.kb=KB + +portlets.myspaces.create_space=Create Space +portlets.myspaces.create_space.title=Create a new Space +portlets.myspaces.upload=Upload +portlets.myspaces.upload.title=Upload a new document +portlets.myspaces.name=name +portlets.myspaces.title=title +portlets.myspaces.description=Description +portlets.myspaces.all_items=All Items +portlets.myspaces.spaces=Spaces +portlets.myspaces.documents=Documents +portlets.myspaces.my_items=My Items +portlets.myspaces.recently_modified=Recently Modified + +portlets.mywebfiles.showing_count_files_in_count_web_projects=Showing {0} file(s) in {1} web project(s) +portlets.mywebfiles.view_web_project=View Web Project +portlets.mywebfiles.my_modified_items=My Modified Items +portlets.mywebfiles.edit=Edit +portlets.mywebfiles.no_items_modified=No items modified + +portlets.mywebforms.view_web_project=View Web Project +portlets.mywebforms.showing_count_forms_in_count_web_projects=Showing {0} forms_in {1} web_projects + +portlets.mytasks.tasks_to_do=Tasks to do +portlets.mytasks.due_today=Due Today +portlets.mytasks.next_7_days=Next 7 days +portlets.mytasks.no_due_date=No due date +portlets.mytasks.overdue=Overdue +portlets.mytasks.showing_overdue=overdue +portlets.mytasks.showing_task=task(s) +portlets.mytasks.showing_due_today=due today +portlets.mytasks.showing_due_next_week=due next week +portlets.mytasks.showing_with_no_due_date_set=with no due date set + +portlets.mytaskspanel.status=Status +portlets.mytaskspanel.priority=Priority +portlets.mytaskspanel.start_date=Start Date +portlets.mytaskspanel.complete=Complete +portlets.mytaskspanel.manage_task=Manage Task +portlets.mytaskspanel.workflow_action=Workflow action +portlets.mytaskspanel.workflow_complited=completed + +portlets.checkin.item_working_copy_of_name_has_been_checked_in=Item \\\"Working Copy of {0}\\\" has been checked in. +portlets.checkout.working_copy_for_the_checked_out=A working copy for the checked out item \\\"Working Copy of {0}\\\" has been created. + +task_summary_panel.close=Close +task_summary_panel.type=Type +task_summary_panel.name=Name +task_summary_panel.start_date=Start Date +task_summary_panel.due_date=Due Date +task_summary_panel.none=None +task_summary_panel.priority=Priority +task_summary_panel.percent_completed=Percent Completed +task_summary_panel.status=status +task_summary_panel.completed=Completed +task_summary_panel.yes=Yes +task_summary_panel.no=No +task_resource_panel.no_task_resources=No task resources + diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index 87e2cbfbd4..3f7a56c416 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -227,6 +227,7 @@ view_details=View Details view_details_file=View Details for file change_details=Change Details update=Update +download=download cut=Cut copy=Copy paste=Paste @@ -310,6 +311,8 @@ checkin_this_file=Check in this file cannot_delete_node_has_working_copy=Cannot delete file \"{0}\" as it has an associated working copy. unknown=Unknown picker_search_min=Please enter at least {0} characters to perform a search. +locked=Locked +no_task_resources=No task resources # Properties username=User Name @@ -335,6 +338,8 @@ locale=Locale quota=Quota sizeCurrent=Usage sizeQuota=Quota +start_date=Start Date +percent_completed=Percent Completed # Repo permission display labels # Note - these come from the server, the english translation is generally the same @@ -350,6 +355,8 @@ ContentPublisher=Content Publisher ContentContributor=Content Contributor ContentReviewer=Content Reviewer +edit_details=Edit Details + # Actions delete=Delete edit=Edit @@ -416,6 +423,7 @@ reply=Reply edit_post=Edit Post reply_to=Reply to post_reply=Post Reply +view_content=View Content # Login page message login_details=Enter Login details @@ -2096,3 +2104,15 @@ condition_composite_error=Composite Condition (ERROR) component_property=Property component_value=Value + +document_list_title=Document List +my_spaces_list_title=My Spaces List +my_tasks_title=My Tasks +my_web_forms_title=My Web Forms +my_web_files_title=My Web Files + +document_list_desc=Document List WebScript +my_spaces_list_desc=My Spaces WebScript +my_tasks_desc=My Tasks WebScript +my_web_forms_desc=My Web Forms WebScript +my_web_files_desc=My Web Files WebScript diff --git a/config/alfresco/portlets-context.xml b/config/alfresco/portlets-context.xml new file mode 100755 index 0000000000..fc7255ecf6 --- /dev/null +++ b/config/alfresco/portlets-context.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + alfresco.messages.portlets + + + + + \ No newline at end of file diff --git a/config/alfresco/templates/client/doclist_preview_panel.ftl b/config/alfresco/templates/client/doclist_preview_panel.ftl index 1643b53868..bc40a94f1d 100644 --- a/config/alfresco/templates/client/doclist_preview_panel.ftl +++ b/config/alfresco/templates/client/doclist_preview_panel.ftl @@ -25,33 +25,33 @@ <#assign navurl='/navigate/showDocDetails/' + node.nodeRef.storeRef.protocol + '/' + node.nodeRef.storeRef.identifier + '/' + node.nodeRef.id> <#if node.isLocked> - (Locked) + (${msg("locked")}) <#elseif hasAspect(node, "cm:workingcopy") == 1> - onclick='event.cancelBubble=true;MyDocs.checkinItem("${node.name}", "${node.nodeRef}");'>Check In + onclick='event.cancelBubble=true;MyDocs.checkinItem("${msg("portlets.checkin.item_working_copy_of_name_has_been_checked_in", node.name)}", "${node.nodeRef}");'>${msg("checkin")} <#else> - onclick='event.cancelBubble=true;MyDocs.checkoutItem("${node.name}", "${node.nodeRef}");'>Check Out + onclick='event.cancelBubble=true;MyDocs.checkoutItem("${msg("portlets.checkout.working_copy_for_the_checked_out", node.name)}", "${node.nodeRef}");'>${msg("checkout")} <#if node.isLocked> - Edit Details + ${msg("edit_details")} <#else> - Edit Details + ${msg("edit_details")} <#if node.isLocked> - Update + ${msg("update")} <#else> - Update + ${msg("update")} - Download + ${msg("download")} <#if node.isLocked> - Delete + ${msg("delete")} <#else> - onclick='event.cancelBubble=true;MyDocs.deleteItem("${node.name}", "${node.nodeRef}");'>Delete + onclick='event.cancelBubble=true;MyDocs.deleteItem("${node.name}", "${node.nodeRef}");'>${msg("delete")} - More Actions... + ${msg("more_actions")}... diff --git a/config/alfresco/templates/client/myspaces_preview_panel.ftl b/config/alfresco/templates/client/myspaces_preview_panel.ftl index ae7433be85..77d12a013c 100644 --- a/config/alfresco/templates/client/myspaces_preview_panel.ftl +++ b/config/alfresco/templates/client/myspaces_preview_panel.ftl @@ -22,7 +22,7 @@ <#else> -
No items to display
+
${msg("no_items")}
@@ -34,41 +34,41 @@ <#if node.isDocument> <#if node.isLocked> - (Locked) + (${msg("locked")}) <#elseif hasAspect(node, "cm:workingcopy") == 1> - onclick='event.cancelBubble=true;MySpaces.checkinItem("${node.name}", "${node.nodeRef}");'>Check In + onclick='event.cancelBubble=true;MySpaces.checkinItem("${msg("portlets.checkin.item_working_copy_of_name_has_been_checked_in", node.name)}", "${node.nodeRef}");'>${msg("checkin")} <#else> - onclick='event.cancelBubble=true;MySpaces.checkoutItem("${node.name}", "${node.nodeRef}");'>Check Out + onclick='event.cancelBubble=true;MySpaces.checkoutItem("${msg("portlets.checkout.working_copy_for_the_checked_out", node.name)}", "${node.nodeRef}");'>${msg("checkout")} <#if node.isLocked> - Edit Details + ${msg("edit_details")} <#else> - Edit Details + ${msg("edit_details")} <#if node.isLocked> - Update + ${msg("update")} <#else> - Update + ${msg("update")} - View Content + ${msg("view_content")} <#if node.isLocked> - Delete + ${msg("delete")} <#else> - onclick='event.cancelBubble=true;MySpaces.deleteItem("${node.name}", "${node.nodeRef}");'>Delete + onclick='event.cancelBubble=true;MySpaces.deleteItem("${node.name}", "${node.nodeRef}");'>${msg("delete")} - More Actions... + ${msg("more_actions")}... <#else> - Edit Details - onclick='event.cancelBubble=true;MySpaces.deleteItem("${node.name}", "${node.nodeRef}");'>Delete + ${msg("edit_details")} + onclick='event.cancelBubble=true;MySpaces.deleteItem("${node.name}", "${node.nodeRef}");'>${msg("delete")} - More Actions... + ${msg("more_actions")}... diff --git a/config/alfresco/templates/client/portlet_node_summary_panel.ftl b/config/alfresco/templates/client/portlet_node_summary_panel.ftl index 86d6d46329..3ad30f5dd9 100644 --- a/config/alfresco/templates/client/portlet_node_summary_panel.ftl +++ b/config/alfresco/templates/client/portlet_node_summary_panel.ftl @@ -13,8 +13,8 @@ <#assign navurl="/navigate/showSpaceDetails/"> <#assign navurl=navurl + node.nodeRef.storeRef.protocol + '/' + node.nodeRef.storeRef.identifier + '/' + node.nodeRef.id> -
Details
- Close +
${msg("details")}
+ ${msg("close")} @@ -49,23 +49,23 @@ <#if node.properties.title?exists> - + <#if node.properties.description?exists> - + - - - - + + + + <#if node.properties.owner?exists> - + <#if node.properties.author?exists> - + <#if node.isDocument> - +
 Title:${node.properties.title?html}
 ${msg("title")}:${node.properties.title?html}
 Description:${node.properties.description?html}
 ${msg("description")}:${node.properties.description?html}
 Created:${node.properties.created?datetime}
 Creator:${node.properties.creator}
 Modified:${node.properties.modified?datetime}
 Modifier:${node.properties.modifier}
 ${msg("created")}:${node.properties.created?datetime}
 ${msg("creator")}:${node.properties.creator}
 ${msg("modified")}:${node.properties.modified?datetime}
 ${msg("modifier")}:${node.properties.modifier}
 Owner:${node.properties.owner}
 ${msg("owner")}:${node.properties.owner}
 Author:${node.properties.author?html}
 ${msg("author")}:${node.properties.author?html}
 Size:${(node.size / 1000)?string("0.##")} KB
 ${msg("size")}:${(node.size / 1000)?string("0.##")} ${msg("kilobyte")}
@@ -75,7 +75,7 @@ <#assign c=cropContent(node.properties.content, 512)> <#if c?length != 0> - Preview: + ${msg("snapshot_preview")}: diff --git a/config/alfresco/templates/client/task_resource_panel.ftl b/config/alfresco/templates/client/task_resource_panel.ftl index 48a5fc778b..a3ea3462f5 100644 --- a/config/alfresco/templates/client/task_resource_panel.ftl +++ b/config/alfresco/templates/client/task_resource_panel.ftl @@ -16,6 +16,6 @@ <#else> - No task resources + ${msg("task_resource_panel.no_task_resources")} \ No newline at end of file diff --git a/config/alfresco/templates/client/task_summary_panel.ftl b/config/alfresco/templates/client/task_summary_panel.ftl index 72618e56e8..3d5bb615b4 100644 --- a/config/alfresco/templates/client/task_summary_panel.ftl +++ b/config/alfresco/templates/client/task_summary_panel.ftl @@ -5,7 +5,7 @@ - +
${task.description?html}Close${msg("task_summary_panel.close")}
@@ -14,20 +14,20 @@ - - - - + + + - - - - + + + +
Type:${task.type?html}
Name:${task.name?html}
Start Date:${task.startDate?date}
Due Date: +
${msg("task_summary_panel.type")}:${task.type?html}
${msg("task_summary_panel.name")}:${task.name?html}
${msg("task_summary_panel.start_date")}:${task.startDate?date}
${msg("task_summary_panel.due_date")}: <#if task.properties["bpm:dueDate"]?exists> ${task.properties["bpm:dueDate"]?date} <#else> - None + ${msg("task_summary_panel.none")}
Priority:${task.properties["bpm:priority"]}
Percent Completed:${task.properties["bpm:percentComplete"]}
Status:${task.properties["bpm:status"]}
Completed:${task.isCompleted?string("Yes", "No")}
${msg("task_summary_panel.priority")}:${task.properties["bpm:priority"]}
${msg("task_summary_panel.percent_completed")}:${task.properties["bpm:percentComplete"]}
${msg("task_summary_panel.status")}:${task.properties["bpm:status"]}
${msg("task_summary_panel.completed")}:${task.isCompleted?string('${msg("task_summary_panel.yes")}', '${msg("task_summary_panel.no")}')}
diff --git a/source/java/org/alfresco/web/bean/ajax/TaskInfoBean.java b/source/java/org/alfresco/web/bean/ajax/TaskInfoBean.java index 4c832237dd..165c4c8514 100644 --- a/source/java/org/alfresco/web/bean/ajax/TaskInfoBean.java +++ b/source/java/org/alfresco/web/bean/ajax/TaskInfoBean.java @@ -33,6 +33,7 @@ import java.util.Map; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import org.alfresco.repo.template.I18NMessageMethod; import org.alfresco.repo.template.Workflow; import org.alfresco.repo.web.scripts.FileTypeImageUtils; import org.alfresco.service.cmr.repository.FileTypeImageSize; @@ -143,6 +144,7 @@ public class TaskInfoBean implements Serializable // create template api methods and objects model.put("date", new Date()); + model.put("msg", new I18NMessageMethod()); model.put("url", new BaseTemplateContentServlet.URLHelper(context)); model.put("task", new Workflow.WorkflowTaskItem( Repository.getServiceRegistry(context), diff --git a/source/web/scripts/ajax/doclist.js b/source/web/scripts/ajax/doclist.js index 18e5d4c5c1..ec5e09774a 100644 --- a/source/web/scripts/ajax/doclist.js +++ b/source/web/scripts/ajax/doclist.js @@ -45,7 +45,7 @@ var MyDocs = { failure: function(response) { // display the error - $('docPanel').setHTML("Sorry, data currently unavailable."); + $('docPanel').setHTML($('displayTheError').innerHTML); // hide the ajax wait panel and show the main doc panel $('docPanelOverlayAjax').setStyle('display', 'none'); @@ -286,7 +286,7 @@ var MyDocs = { }, failure: function(response) { - resource.innerHTML = "Sorry, preview currently unavailable."; + resource.innerHTML = $('previewCurrentlyUnavailable').innerHTML; }, argument: [resource] }, @@ -534,7 +534,7 @@ var MyDocs = { if (response.responseText.indexOf("OK:") == 0) { MyDocs.refreshList(); - MyDocs.displayMessage("A working copy for the checked out item 'Working Copy of " + name + "' has been created."); + MyDocs.displayMessage(name); } else { @@ -569,7 +569,7 @@ var MyDocs = { if (response.responseText.indexOf("OK:") == 0) { MyDocs.refreshList(); - MyDocs.displayMessage("Item 'Working Copy of " + name + "' has been checked in."); + MyDocs.displayMessage(name); } else { diff --git a/source/web/scripts/ajax/myspaces.js b/source/web/scripts/ajax/myspaces.js index e1035e449c..b2291742f2 100644 --- a/source/web/scripts/ajax/myspaces.js +++ b/source/web/scripts/ajax/myspaces.js @@ -60,7 +60,7 @@ var MySpaces = { failure: function(response) { // display the error - $('spacePanel').setHTML("Sorry, data currently unavailable."); + $('spacePanel').setHTML($('displayTheError').innerHTML); // hide the ajax wait panel and show the main spaces panel $('spacePanelOverlayAjax').setStyle('display', 'none'); @@ -302,7 +302,7 @@ var MySpaces = { }, failure: function(response) { - resource.innerHTML = "Sorry, preview currently unavailable."; + resource.innerHTML = $('previewCurrentlyUnavailable').innerHTML; }, argument: [resource] }, @@ -712,7 +712,7 @@ var MySpaces = { if (response.responseText.indexOf("OK:") == 0) { MySpaces.refreshList(); - MySpaces.displayMessage("A working copy for the checked out item 'Working Copy of " + name + "' has been created."); + MySpaces.displayMessage(name); } else { @@ -747,7 +747,7 @@ var MySpaces = { if (response.responseText.indexOf("OK:") == 0) { MySpaces.refreshList(); - MySpaces.displayMessage("Item 'Working Copy of " + name + "' has been checked in."); + MySpaces.displayMessage(name); } else { diff --git a/source/web/scripts/ajax/mytasks.js b/source/web/scripts/ajax/mytasks.js index 202c3dc509..6be27a2e9e 100644 --- a/source/web/scripts/ajax/mytasks.js +++ b/source/web/scripts/ajax/mytasks.js @@ -30,7 +30,7 @@ var MyTasks = { failure: function(response) { // display the error - $('taskPanel').setHTML("Sorry, data currently unavailable."); + $('taskPanel').setHTML($('displayTheError').innerHTML); // hide the ajax wait panel and show the main task panel $('taskPanelOverlay').setStyle('visibility', 'hidden');