[MERGE] jQuery.timeago translation support, re-extract POTs

bzr revid: xmo@openerp.com-20120702071428-0y2wuvn8wajvi6we

addons/web/static/lib/jquery.timeago/jquery.timeago.js

@@ -1,6 +1,8 @@
 /**
  * Timeago is a jQuery plugin that makes it easy to support automatically
  * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
+ * 
+ * Please note that the library has been slightly modified for i18n's sake.
  *
  * @name timeago
  * @version 0.11.3
@@ -49,7 +51,8 @@
         years: "%d years",
         wordSeparator: " ",
         numbers: []
-      }
+      },
+      translator: null
     },
     inWords: function(distanceMillis) {
       var $l = this.settings.strings;
@@ -68,26 +71,36 @@
       var days = hours / 24;
       var years = days / 365;
 
-      function substitute(stringOrFunction, number) {
+      function convert(stringOrFunction, number) {
         var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
-        var value = ($l.numbers && $l.numbers[number]) || number;
+
-        return string.replace(/%d/i, value);
+        // return the proper string and the numeric value that goes in it
+        return {'string': string, 'value': ($l.numbers && $l.numbers[number]) || number};
       }
 
-      var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
+      var stringAndNumber = seconds < 45 && convert($l.seconds, Math.round(seconds)) ||
-        seconds < 90 && substitute($l.minute, 1) ||
+        seconds < 90 && convert($l.minute, 1) ||
-        minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
+        minutes < 45 && convert($l.minutes, Math.round(minutes)) ||
-        minutes < 90 && substitute($l.hour, 1) ||
+        minutes < 90 && convert($l.hour, 1) ||
-        hours < 24 && substitute($l.hours, Math.round(hours)) ||
+        hours < 24 && convert($l.hours, Math.round(hours)) ||
-        hours < 42 && substitute($l.day, 1) ||
+        hours < 42 && convert($l.day, 1) ||
-        days < 30 && substitute($l.days, Math.round(days)) ||
+        days < 30 && convert($l.days, Math.round(days)) ||
-        days < 45 && substitute($l.month, 1) ||
+        days < 45 && convert($l.month, 1) ||
-        days < 365 && substitute($l.months, Math.round(days / 30)) ||
+        days < 365 && convert($l.months, Math.round(days / 30)) ||
-        years < 1.5 && substitute($l.year, 1) ||
+        years < 1.5 && convert($l.year, 1) ||
-        substitute($l.years, Math.round(years));
+        convert($l.years, Math.round(years));
 
+      var string = stringAndNumber.string;
+      var value = stringAndNumber.value;
       var separator = $l.wordSeparator === undefined ?  " " : $l.wordSeparator;
-      return $.trim([prefix, words, suffix].join(separator));
+
+      // compose and translate the final string
+      var fullString = $.trim([prefix, string, suffix].join(separator));
+      var translatedString = $t.settings.translator ? 
+              $t.settings.translator(fullString) : 
+              fullString;
+
+      return translatedString.replace(/%d/i, value);
     },
     parse: function(iso8601) {
       var s = $.trim(iso8601);

addons/web/static/src/js/coresetup.js

@@ -608,15 +608,31 @@ instance.web.qweb.preprocess_node = function() {
 };
 
 /** Setup jQuery timeago */
-var timeago_setup = function () {
+var _t = instance.web._t;
-    var s = $.timeago.settings.strings;
+/*
-    _.each(s, function(v,k) {
+ * Strings in timeago are "composed" with prefixes, words and suffixes. This
-        if(_.isString(v)) {
+ * makes their detection by our translating system impossible. Use all literal
-            s[k] = instance.web._t(v);
+ * strings we're using with a translation mark here so the extractor can do its
-        }
+ * job.
-    });
+ */
+{
+    _t('less than a minute ago');
+    _t('about a minute ago');
+    _t('%d minutes ago');
+    _t('about an hour ago');
+    _t('%d hours ago');
+    _t('a day ago');
+    _t('%d days ago');
+    _t('about a month ago');
+    _t('%d months ago');
+    _t('about a year ago');
+    _t('%d years ago');
 }
-instance.connection.on('module_loaded', this, timeago_setup);
+
+instance.connection.on('module_loaded', this, function () {
+    // provide timeago.js with our own translator method
+    $.timeago.settings.translator = instance.web._t;
+});
 
 /**
  * Registry for all the client actions key: tag value: widget

addons/web_calendar/i18n/web_calendar.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,23 +18,125 @@ msgstr ""
 "Generated-By: Babel 0.9.6\n"
 
 #. openerp-web
-#: addons/web_calendar/static/src/js/calendar.js:11
+#: addons/web_calendar/static/src/js/calendar.js:12
 msgid "Calendar"
 msgstr ""
 
 #. openerp-web
-#: addons/web_calendar/static/src/js/calendar.js:466
+#: addons/web_calendar/static/src/js/calendar.js:73
-msgid "Responsible"
+msgid "Filter"
 msgstr ""
 
 #. openerp-web
-#: addons/web_calendar/static/src/js/calendar.js:504
+#: addons/web_calendar/static/src/js/calendar.js:139
-msgid "Navigator"
+msgid "Today"
 msgstr ""
 
 #. openerp-web
-#: addons/web_calendar/static/src/xml/web_calendar.xml:5
+#: addons/web_calendar/static/src/js/calendar.js:140
-#: addons/web_calendar/static/src/xml/web_calendar.xml:6
+msgid "Day"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:141
+msgid "Week"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:142
+msgid "Month"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:143
+msgid "New event"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:144
+msgid "Save"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:145
+msgid "Cancel"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:146
+msgid "Details"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:147
+msgid "Edit"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:148
+msgid "Delete"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:150
+msgid "Event will be deleted permanently, are you sure?"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:151
+#: addons/web_calendar/static/src/js/calendar.js:164
+msgid "Description"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:152
+msgid "Time period"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:153
+msgid "Full day"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:156
+msgid "Do you want to edit the whole set of repeated events?"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:157
+msgid "Repeat event"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:158
+msgid "Disabled"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:159
+msgid "Enabled"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:162
+#: addons/web_calendar/static/src/js/calendar.js:170
+msgid "Agenda"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:163
+msgid "Date"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:167
+msgid "Year"
+msgstr ""
+
+#. openerp-web
+#: addons/web_calendar/static/src/xml/web_calendar.xml:8
+#: addons/web_calendar/static/src/xml/web_calendar.xml:9
 msgid "&nbsp;"
 msgstr ""
 

addons/web_dashboard/i18n/web_dashboard.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-14 15:27+0100\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,31 +18,15 @@ msgstr ""
 "Generated-By: Babel 0.9.6\n"
 
 #. openerp-web
-#: addons/web_dashboard/static/src/js/dashboard.js:63
+#: addons/web_dashboard/static/src/js/dashboard.js:61
 msgid "Edit Layout"
 msgstr ""
 
 #. openerp-web
-#: addons/web_dashboard/static/src/js/dashboard.js:109
+#: addons/web_dashboard/static/src/js/dashboard.js:107
 msgid "Are you sure you want to remove this item ?"
 msgstr ""
 
-#. openerp-web
-#: addons/web_dashboard/static/src/js/dashboard.js:316
-msgid "Uncategorized"
-msgstr ""
-
-#. openerp-web
-#: addons/web_dashboard/static/src/js/dashboard.js:324
-#, python-format
-msgid "Execute task \"%s\""
-msgstr ""
-
-#. openerp-web
-#: addons/web_dashboard/static/src/js/dashboard.js:325
-msgid "Mark this task as done"
-msgstr ""
-
 #. openerp-web
 #: addons/web_dashboard/static/src/xml/web_dashboard.xml:4
 msgid "Reset Layout.."
@@ -78,35 +62,3 @@ msgstr ""
 msgid "Choose dashboard layout"
 msgstr ""
 
-#. openerp-web
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:62
-msgid "progress:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:67
-msgid ""
-"Click on the functionalites listed below to launch them and configure "
-"your system"
-msgstr ""
-
-#. openerp-web
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:110
-msgid "Welcome to OpenERP"
-msgstr ""
-
-#. openerp-web
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:118
-msgid "Remember to bookmark"
-msgstr ""
-
-#. openerp-web
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:119
-msgid "This url"
-msgstr ""
-
-#. openerp-web
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:121
-msgid "Your login:"
-msgstr ""
-

addons/web_diagram/i18n/web_diagram.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,27 +23,53 @@ msgid "Diagram"
 msgstr ""
 
 #. openerp-web
-#: addons/web_diagram/static/src/js/diagram.js:208
+#: addons/web_diagram/static/src/js/diagram.js:165
+msgid "Are you sure?"
+msgstr ""
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:195
+msgid ""
+"Deleting this node cannot be undone.\n"
+"It will also delete all connected transitions.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:213
+msgid ""
+"Deleting this transition cannot be undone.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:224
+#: addons/web_diagram/static/src/js/diagram.js:257
 msgid "Activity"
 msgstr ""
 
 #. openerp-web
-#: addons/web_diagram/static/src/js/diagram.js:208
+#: addons/web_diagram/static/src/js/diagram.js:232
-msgid "Transition"
+#: addons/web_diagram/static/src/js/diagram.js:296
-msgstr ""
-
-#. openerp-web
-#: addons/web_diagram/static/src/js/diagram.js:214
-msgid "Create:"
-msgstr ""
-
-#. openerp-web
-#: addons/web_diagram/static/src/js/diagram.js:231
 msgid "Open: "
 msgstr ""
 
 #. openerp-web
-#: addons/web_diagram/static/src/xml/base_diagram.xml:5
+#: addons/web_diagram/static/src/js/diagram.js:262
+#: addons/web_diagram/static/src/js/diagram.js:314
+msgid "Create:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:289
+#: addons/web_diagram/static/src/js/diagram.js:308
+msgid "Transition"
+msgstr ""
+
+#. openerp-web
+#: addons/web_diagram/static/src/xml/base_diagram.xml:6
 msgid "New Node"
 msgstr ""
 

addons/web_gantt/i18n/web_gantt.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

addons/web_graph/i18n/web_graph.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,82 @@ msgstr ""
 "Generated-By: Babel 0.9.6\n"
 
 #. openerp-web
-#: addons/web_graph/static/src/js/graph.js:19
+#: addons/web_graph/static/src/js/graph.js:22
 msgid "Graph"
 msgstr ""
 
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:5
+msgid "Graph Options"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:7
+msgid "Graph Mode"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:11
+msgid "Pie"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:12
+msgid "Bars"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:14
+msgid "Lines"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:15
+msgid "Areas"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:18
+msgid "Radar"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:20
+msgid "Legend"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:24
+msgid "Hidden"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:25
+msgid "Inside"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:26
+msgid "Top"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:28
+msgid "Actions"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:32
+msgid "Switch Axis"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:33
+msgid "Show Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:34
+msgid "Download as PNG"
+msgstr ""
+

addons/web_hello/i18n/web_hello.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

addons/web_kanban/i18n/web_kanban.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-14 15:27+0100\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,32 +23,42 @@ msgid "Kanban"
 msgstr ""
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:294
+#: addons/web_kanban/static/src/js/kanban.js:372
 msgid "Undefined"
 msgstr ""
 
 #. openerp-web
-#: addons/web_kanban/static/src/js/kanban.js:469
+#: addons/web_kanban/static/src/js/kanban.js:684
 msgid "Are you sure you want to delete this record ?"
 msgstr ""
 
 #. openerp-web
-#: addons/web_kanban/static/src/xml/web_kanban.xml:5
+#: addons/web_kanban/static/src/js/kanban.js:839
-msgid "Create"
+msgid "Create: "
 msgstr ""
 
 #. openerp-web
-#: addons/web_kanban/static/src/xml/web_kanban.xml:41
+#: addons/web_kanban/static/src/xml/web_kanban.xml:53
 msgid "Show more... ("
 msgstr ""
 
 #. openerp-web
-#: addons/web_kanban/static/src/xml/web_kanban.xml:41
+#: addons/web_kanban/static/src/xml/web_kanban.xml:53
 msgid "remaining)"
 msgstr ""
 
 #. openerp-web
-#: addons/web_kanban/static/src/xml/web_kanban.xml:59
+#: addons/web_kanban/static/src/xml/web_kanban.xml:71
-msgid "</tr><tr>"
+msgid "Add"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:71
+msgid "or"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:72
+msgid "Cancel"
 msgstr ""
 

addons/web_mobile/i18n/web_mobile.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-07 10:13+0100\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

addons/web_process/i18n/web_process.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-07 19:19+0100\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

addons/web_rpc/i18n/web_rpc.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

addons/web_tests/i18n/web_tests.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"