Merge pull request #16 from bforest/master

 French i18n/l10n translation + Cleaning

alfresco-systemmessages-platform/src/main/resources/alfresco/module/alfresco-systemmessages-platform/context/bean-context.xml

@@ -11,6 +11,11 @@
         <value>alfresco/module/alfresco-systemmessages-platform/model/systemmessages-model.xml</value>
       </list>
     </property>
+    <property name="labels">
+      <list>
+        <value>alfresco/module/alfresco-systemmessages-platform/messages/systemmessages-model</value>
+      </list>
+    </property>
   </bean>
 
   <!-- Service bean  -->

alfresco-systemmessages-platform/src/main/resources/alfresco/module/alfresco-systemmessages-platform/messages/systemmessages-model.properties

@@ -0,0 +1,10 @@
+# Type
+rlsm_systemMessagesModel.type.rlsm_systemMessage.title=System messages
+
+
+# Properties
+rlsm_systemMessagesModel.property.rlsm_systemMessageTitle.title=Title
+rlsm_systemMessagesModel.property.rlsm_systemMessageDescription.title=Description
+rlsm_systemMessagesModel.property.rlsm_systemMessageStartTime.title=Start Time
+rlsm_systemMessagesModel.property.rlsm_systemMessageEndTime.title=End Time
+rlsm_systemMessagesModel.property.rlsm_systemMessagePriority.title=Priority

alfresco-systemmessages-platform/src/main/resources/alfresco/module/alfresco-systemmessages-platform/messages/systemmessages-model_fr.properties

@@ -0,0 +1,10 @@
+# Type
+rlsm_systemMessagesModel.type.rlsm_systemMessage.title=Messages syst\u00e8me
+
+
+# Properties
+rlsm_systemMessagesModel.property.rlsm_systemMessageTitle.title=Titre
+rlsm_systemMessagesModel.property.rlsm_systemMessageDescription.title=Description
+rlsm_systemMessagesModel.property.rlsm_systemMessageStartTime.title=Date de d\u00e9but
+rlsm_systemMessagesModel.property.rlsm_systemMessageEndTime.title=Date de fin
+rlsm_systemMessagesModel.property.rlsm_systemMessagePriority.title=Priorit\u00e9

alfresco-systemmessages-platform/src/main/resources/alfresco/module/alfresco-systemmessages-platform/messages/systemmessages-model_sv.properties

@@ -0,0 +1,10 @@
+# Type
+rlsm_systemMessagesModel.type.rlsm_systemMessage.title=Systemmeddelanden
+
+
+# Properties
+rlsm_systemMessagesModel.property.rlsm_systemMessageTitle.title=Titel
+rlsm_systemMessagesModel.property.rlsm_systemMessageDescription.title=Beskrivning
+rlsm_systemMessagesModel.property.rlsm_systemMessageStartTime.title=Starttid
+rlsm_systemMessagesModel.property.rlsm_systemMessageEndTime.title=Sluttid
+rlsm_systemMessagesModel.property.rlsm_systemMessagePriority.title=Prioritet

alfresco-systemmessages-share/src/main/resources/META-INF/redpill/components/system-messages/system-messages-admin.js

@@ -66,19 +66,28 @@ YAHOO.extend(Redpill.SystemMessages, Alfresco.component.Base, {
            elCell.innerHTML = this.msg("label.none");
         }
     },
+    typeFormatter: function (elCell, oRecord, oColumn, oData) {
+      var html = '';
+
+      if (oData) {
+        html = this.msg("systemmessages.priority." + oData.toLowerCase());
+      }
+
+      elCell.innerHTML = html;
+    },
 
     setupDataTable: function () {
         Alfresco.logger.debug("setupDataTable", arguments);
         var columnDefinitions = [
             {
                 key: "title",
                 label: this.msg("title.title"),
-                sortable: false,
+                sortable: false
             },
             {
                 key: "text",
                 label: this.msg("title.text"),
-                sortable: false,
+                sortable: false
             },
             {
                 key: "startTime",
@@ -96,6 +105,7 @@ YAHOO.extend(Redpill.SystemMessages, Alfresco.component.Base, {
                 key: "type",
                 label: this.msg("title.type"),
                 sortable: false,
+                formatter: this.typeFormatter.bind(this)
             },
             {
                 key: "actions",

alfresco-systemmessages-share/src/main/resources/alfresco/web-extension/messages/systemmessages.properties

@@ -1,3 +1,4 @@
+systemmessages.admin-console.title=System Messages
 title.title=Title
 title.text=Description
 title.startTime=Start time
@@ -15,3 +16,6 @@ message.delete.confirm=Are you sure you want to delete this message?
 tool.system-messages-admin.label=System Messages
 tool.system-messages-admin.description=System Messages Administration
 no.messages.found=No messages
+systemmessages.priority.high=High
+systemmessages.priority.normal=Normal
+systemmessages.priority.low=Low

alfresco-systemmessages-share/src/main/resources/alfresco/web-extension/messages/systemmessages_fr.properties

@@ -0,0 +1,21 @@
+systemmessages.admin-console.title=Messages syst\u00e8me
+title.title=Titre
+title.text=Description
+title.startTime=Date de d\u00e9but
+title.endTime=Date de fin
+title.type=Priorit\u00e9
+title.actions=Actions
+new.message=Nouveau message
+label.edit.title=\u00c9diter le message
+label.new-row.title=Nouveau message
+message.new-row.success=Message ajout\u00e9 avec succ\u00e8s
+message.edit.success=Message mis \u00e0 jour avec succ\u00e8s
+message.new-row.failure=Une erreur s'est produite lors de l'ajout du message
+message.edit.failure=Une erreur s'est produite lors de la mise \u00e0 jour du message
+message.delete.confirm=\u00cates-vous s\u00fbr de vouloir supprimer ce message ?
+tool.system-messages-admin.label=Messages syst\u00e8me
+tool.system-messages-admin.description=Administration des messages syst\u00e8me
+no.messages.found=Aucun message
+systemmessages.priority.high=\u00c9lev\u00e9e
+systemmessages.priority.normal=Normale
+systemmessages.priority.low=Basse

alfresco-systemmessages-share/src/main/resources/alfresco/web-extension/messages/systemmessages_sv.properties

@@ -1,3 +1,4 @@
+systemmessages.admin-console.title=Systemmeddelanden
 title.title=Titel
 title.text=Beskrivning
 title.startTime=Starttid
@@ -15,3 +16,6 @@ message.delete.confirm=\u00c4r du s\u00e4ker p\u00e5 att du vill ta bort detta m
 tool.system-messages-admin.label=Systemmeddelanden
 tool.system-messages-admin.description=Administration av Systemmeddelanden
 no.messages.found=Inga meddelanden
+systemmessages.priority.high=H\u00f6g
+systemmessages.priority.normal=Normal
+systemmessages.priority.low=L\u00e5g

alfresco-systemmessages-share/src/main/resources/alfresco/web-extension/site-webscripts/com/redpill-linpro/system-messages/system-messages-admin.get.html.ftl

@@ -13,10 +13,10 @@
 <@markup id="html">
 <@uniqueIdDiv>
 <#assign el=args.htmlid?html>
-    <div class="title">System Messages</div>
+    <div class="title">${msg('systemmessages.admin-console.title')}</div>
 
     <div class="dashlet messages-list">
-        <div class="title">System Messages</div>
+        <div class="title">${msg('systemmessages.admin-console.title')}</div>
         <div id="${el}-messages-list-info" class="tags-list-info"></div>
         <div id="${el}-messages-list-bar-bottom" class="toolbar theme-bg-color-3 hidden">
             <div id="${el}-paginator" class="paginator hidden">&nbsp;</div>