diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po index d40f49e31e7..134f1d4c05b 100644 --- a/addons/web/i18n/fr.po +++ b/addons/web/i18n/fr.po @@ -1556,63 +1556,3 @@ msgstr "Pour plus d'informations veuillez consulter" #: addons/web/static/src/xml/base.xml:1823 msgid "OpenERP.com" msgstr "OpenERP.com" - -#. openerp-web -msgid "timeago-prefixAgo" -msgstr "Il y a" - -#. openerp-web -msgid "timeago-prefixFromNow" -msgstr " " - -#. openerp-web -msgid "timeago-suffixAgo" -msgstr " " - -#. openerp-web -msgid "timeago-suffixFromNow" -msgstr " " - -#. openerp-web -msgid "less than a minute" -msgstr "moins d'une minute" - -#. openerp-web -msgid "about a minute" -msgstr "environ une minute" - -#. openerp-web -msgid "%d minutes" -msgstr "%d minutes" - -#. openerp-web -msgid "about an hour" -msgstr "environ une heure" - -#. openerp-web -msgid "%d hours" -msgstr "%d heures" - -#. openerp-web -msgid "a days" -msgstr "un jours" - -#. openerp-web -msgid "%d days" -msgstr "%d jours" - -#. openerp-web -msgid "about a month" -msgstr "environ un mois" - -#. openerp-web -msgid "%d mois" -msgstr "%d mois" - -#. openerp-web -msgid "about a year" -msgstr "environ un an" - -#. openerp-web -msgid "%d years" -msgstr "%d ans" diff --git a/addons/web/static/lib/jquery.timeago/jquery.timeago.js b/addons/web/static/lib/jquery.timeago/jquery.timeago.js index 341a1841c94..7e138c9d328 100644 --- a/addons/web/static/lib/jquery.timeago/jquery.timeago.js +++ b/addons/web/static/lib/jquery.timeago/jquery.timeago.js @@ -32,10 +32,10 @@ refreshMillis: 60000, allowFuture: false, strings: { - prefixAgo: "timeago-prefixAgo", - prefixFromNow: "timeago-prefixFromNow", - suffixAgo: "timeago-suffixAgo", //ago - suffixFromNow: "timeago-suffixFromNow", //from now + prefixAgo: null, + prefixFromNow: null, + suffixAgo: "ago", + suffixFromNow: "from now", seconds: "less than a minute", minute: "about a minute", minutes: "%d minutes", @@ -49,7 +49,8 @@ years: "%d years", wordSeparator: " ", numbers: [] - } + }, + translator: function(str) {} }, inWords: function(distanceMillis) { var $l = this.settings.strings;