From 91594a760769b718a68ab399f204336c355af156 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Wed, 22 Jul 2015 13:34:23 +0200 Subject: [PATCH 1/8] Add module datetime_formatter. This module allows the developer to format any date/time combination in the most comfortable way for the user, just with a quick call to --- datetime_formatter/README.rst | 76 +++++++++++ datetime_formatter/__init__.py | 4 + datetime_formatter/__openerp__.py | 18 +++ datetime_formatter/exceptions.py | 11 ++ datetime_formatter/models.py | 120 ++++++++++++++++++ .../static/description/icon.png | Bin 0 -> 9455 bytes datetime_formatter/tests/__init__.py | 4 + datetime_formatter/tests/test_best_matcher.py | 75 +++++++++++ datetime_formatter/tests/test_formatter.py | 92 ++++++++++++++ 9 files changed, 400 insertions(+) create mode 100644 datetime_formatter/README.rst create mode 100644 datetime_formatter/__init__.py create mode 100644 datetime_formatter/__openerp__.py create mode 100644 datetime_formatter/exceptions.py create mode 100644 datetime_formatter/models.py create mode 100644 datetime_formatter/static/description/icon.png create mode 100644 datetime_formatter/tests/__init__.py create mode 100644 datetime_formatter/tests/test_best_matcher.py create mode 100644 datetime_formatter/tests/test_formatter.py diff --git a/datetime_formatter/README.rst b/datetime_formatter/README.rst new file mode 100644 index 000000000..46674323f --- /dev/null +++ b/datetime_formatter/README.rst @@ -0,0 +1,76 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +===================== +Date & Time Formatter +===================== + +This module was written to extend the functionality of Odoo language engine to +support formatting `Date`, `Time` and `Datetime` fields easily and allow you to +print them in the best format for the user. + +Usage +===== + +This module adds a technical programming feature, and it should be used by +addon developers, not by end users. This means that you must not expect to see +any changes if you are a user and install this, but if you find you have it +already installed, it's probably because you have another modules that depend +on this one. + +If you are a developer, to use this module, you need to: + +* Call anywhere in your code:: + + formatted_string = self.env["res.lang"].datetime_formatter(datetime_value) + +* If you use Qweb:: + + + +* If you call it from a record that has a `lang` field:: + + formatted_string = record.lang.datetime_formatter(record.datetime_field) + +* ``models.ResLang.datetime_formatter`` docstring explains its usage. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/149/8.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed `feedback +`_. + + +Credits +======= + +Contributors +------------ + +* Jairo Llopis + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit http://odoo-community.org. diff --git a/datetime_formatter/__init__.py b/datetime_formatter/__init__.py new file mode 100644 index 000000000..f2586f5d4 --- /dev/null +++ b/datetime_formatter/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import models diff --git a/datetime_formatter/__openerp__.py b/datetime_formatter/__openerp__.py new file mode 100644 index 000000000..8e277f5f9 --- /dev/null +++ b/datetime_formatter/__openerp__.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + "name": "Date & Time Formatter", + "summary": "Helper functions to give correct format to date[time] fields", + "version": "8.0.1.0.0", + "category": "Tools", + "website": "https://grupoesoc.es", + "author": "Grupo ESOC Ingeniería de Servicios, " + "Odoo Community Association (OCA)", + "license": "AGPL-3", + "installable": True, + "depends": [ + "base", + ], +} diff --git a/datetime_formatter/exceptions.py b/datetime_formatter/exceptions.py new file mode 100644 index 000000000..9c6c35063 --- /dev/null +++ b/datetime_formatter/exceptions.py @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- +# © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from openerp import _, exceptions + + +class BestMatchedLanguageNotFoundError(exceptions.MissingError): + def __init__(self, lang): + msg = (_("Best matched language (%s) not found.") % lang) + super(BestMatchedLanguageNotFoundError, self).__init__(msg) + self.lang = lang diff --git a/datetime_formatter/models.py b/datetime_formatter/models.py new file mode 100644 index 000000000..6baa92b41 --- /dev/null +++ b/datetime_formatter/models.py @@ -0,0 +1,120 @@ +# -*- coding: utf-8 -*- +# © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from datetime import datetime, timedelta +from openerp import api, exceptions, fields, models +from openerp.tools import (DEFAULT_SERVER_DATE_FORMAT, + DEFAULT_SERVER_TIME_FORMAT) +from . import exceptions as ex + +# Available modes for :param:`.ResLang.datetime_formatter.template` +MODE_DATETIME = "MODE_DATETIME" +MODE_DATE = "MODE_DATE" +MODE_TIME = "MODE_TIME" + + +class ResLang(models.Model): + _inherit = "res.lang" + + @api.model + @api.returns('self') + def best_match(self, lang=None, failure_safe=True): + """Get best match of current default lang. + + :param str lang: + If a language in the form of "en_US" is supplied, it will have the + highest priority. + + :param bool failure_safe: + If ``False`` and the best matched language is not found installed, + an exception will be raised. Otherwise, the first installed + language found in the DB will be returned. + """ + # Find some installed language, as fallback + first_installed = self.search([("active", "=", True)], limit=1) + + if not lang: + lang = ( + # Object's language, if called like + # ``record.lang.datetime_formatter(datetime_obj)`` + (self.ids and self[0].code) or + + # Context language + self.env.context.get("lang") or + + # User's language + self.env.user.lang or + + # First installed language found + first_installed.code) + + # Get DB lang record + record = self.search([("code", "=", lang)]) + + try: + record.ensure_one() + except exceptions.except_orm: + if not failure_safe: + raise ex.BestMatchedLanguageNotFoundError(lang) + else: + record = first_installed + + return record + + @api.model + def datetime_formatter(self, value, lang=None, template=MODE_DATETIME, + separator=" ", failure_safe=True): + """Convert a datetime field to lang's default format. + + :type value: `str`, `float` or `datetime.datetime` + :param value: + Datetime that will be formatted to the user's preferred format. + + :param str lang: + See :param:`lang` from :meth:`~.best_match`. + + :param bool failure_safe: + See :param:`failure_safe` from :meth:`~.best_match`. + + :param str template: + Will be used to format :param:`value`. If it is one of the special + constants :const:`MODE_DATETIME`, :const:`MODE_DATE` or + :const:`MODE_TIME`, it will use the :param:`lang`'s default + template for that mode. + + :param str separator: + Only used when :param:`template` is :const:`MODE_DATETIME`, as the + separator between the date and time parts. + """ + # Get the correct lang + lang = self.best_match(lang) + + # Get the template + if template in {MODE_DATETIME, MODE_DATE, MODE_TIME}: + defaults = [] + if "DATE" in template: + defaults.append(lang.date_format or + DEFAULT_SERVER_DATE_FORMAT) + if "TIME" in template: + defaults.append(lang.time_format or + DEFAULT_SERVER_TIME_FORMAT) + template = separator.join(defaults) + + # Convert str to datetime objects + if isinstance(value, (str, unicode)): + try: + value = fields.Datetime.from_string(value) + except ValueError: + # Probably failed due to value being only time + value = datetime.strptime(value, DEFAULT_SERVER_TIME_FORMAT) + + # Time-only fields are floats for Odoo + elif isinstance(value, float): + # Patch values >= 24 hours + if value >= 24: + template = template.replace("%H", "%d" % value) + + # Convert to time + value = (datetime.min + timedelta(hours=value)).time() + + return value.strftime(template) diff --git a/datetime_formatter/static/description/icon.png b/datetime_formatter/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/datetime_formatter/tests/__init__.py b/datetime_formatter/tests/__init__.py new file mode 100644 index 000000000..ead2fd4e0 --- /dev/null +++ b/datetime_formatter/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import test_best_matcher, test_formatter diff --git a/datetime_formatter/tests/test_best_matcher.py b/datetime_formatter/tests/test_best_matcher.py new file mode 100644 index 000000000..e15bd9757 --- /dev/null +++ b/datetime_formatter/tests/test_best_matcher.py @@ -0,0 +1,75 @@ +# -*- coding: utf-8 -*- +# © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from openerp.tests.common import TransactionCase +from .. import exceptions + + +class BasicCase(TransactionCase): + def setUp(self): + super(BasicCase, self).setUp() + self.langs = ("en_US", "es_ES", "it_IT", "pt_PT", "zh_CN") + self.rl = self.env["res.lang"] + for lang in self.langs: + if not self.rl.search([("code", "=", lang)]): + self.rl.load_lang(lang) + + def test_explicit(self): + """When an explicit lang is used.""" + for lang in self.langs: + self.assertEqual(self.rl.best_match(lang).code, lang) + + def test_record(self): + """When called from a ``res.lang`` record.""" + rl = self.rl.with_context(lang="it_IT") + rl.env.user.lang = "pt_PT" + + for lang in self.langs: + self.assertEqual( + rl.search([("code", "=", lang)]).best_match().code, + lang) + + def test_context(self): + """When called with a lang in context.""" + self.env.user.lang = "pt_PT" + + for lang in self.langs: + self.assertEqual( + self.rl.with_context(lang=lang).best_match().code, + lang) + + def test_user(self): + """When lang not specified in context.""" + for lang in self.langs: + self.env.user.lang = lang + + # Lang is False in context + self.assertEqual( + self.rl.with_context(lang=False).best_match().code, + lang) + + # Lang not found in context + self.assertEqual( + self.rl.with_context(dict()).best_match().code, + lang) + + def test_first_installed(self): + """When falling back to first installed language.""" + first = self.rl.search([("active", "=", True)], limit=1) + self.env.user.lang = False + self.assertEqual( + self.rl.with_context(lang=False).best_match().code, + first.code) + + def test_unavailable(self): + """When matches to an unavailable language.""" + self.env.user.lang = False + self.rl = self.rl.with_context(lang=False) + first = self.rl.search([("active", "=", True)], limit=1) + + # Safe mode + self.assertEqual(self.rl.best_match("fake_LANG").code, first.code) + + # Unsafe mode + with self.assertRaises(exceptions.BestMatchedLanguageNotFoundError): + self.rl.best_match("fake_LANG", failure_safe=False) diff --git a/datetime_formatter/tests/test_formatter.py b/datetime_formatter/tests/test_formatter.py new file mode 100644 index 000000000..51a4a0fe0 --- /dev/null +++ b/datetime_formatter/tests/test_formatter.py @@ -0,0 +1,92 @@ +# -*- coding: utf-8 -*- +# © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +import datetime +from random import random +from openerp.tests.common import TransactionCase +from openerp.tools import (DEFAULT_SERVER_DATE_FORMAT, + DEFAULT_SERVER_TIME_FORMAT, + DEFAULT_SERVER_DATETIME_FORMAT) +from ..models import MODE_DATE, MODE_TIME, MODE_DATETIME + + +class FormatterCase(TransactionCase): + def setUp(self): + super(FormatterCase, self).setUp() + self.rl = self.env["res.lang"] + self.bm = self.rl.best_match() + self.dt = datetime.datetime.now() + self.d_fmt = self.bm.date_format or DEFAULT_SERVER_DATE_FORMAT + self.t_fmt = self.bm.time_format or DEFAULT_SERVER_TIME_FORMAT + self.kwargs = dict() + + def tearDown(self): + # This should be returned + self.expected = self.dt.strftime(self.format) + + # Pass a datetime object + self.assertEqual( + self.expected, + self.rl.datetime_formatter( + self.dt, + **self.kwargs)) + + # When the date comes as a string + if isinstance(self.dt, datetime.datetime): + self.dt_str = self.dt.strftime(DEFAULT_SERVER_DATETIME_FORMAT) + elif isinstance(self.dt, datetime.date): + self.dt_str = self.dt.strftime(DEFAULT_SERVER_DATE_FORMAT) + elif isinstance(self.dt, datetime.time): + self.dt_str = self.dt.strftime(DEFAULT_SERVER_TIME_FORMAT) + + # Pass a string + self.assertEqual( + self.expected, + self.rl.datetime_formatter( + self.dt_str, + **self.kwargs)) + + # Pass a unicode + self.assertEqual( + self.expected, + self.rl.datetime_formatter( + unicode(self.dt_str), + **self.kwargs)) + + super(FormatterCase, self).tearDown() + + def test_datetime(self): + """Format a datetime.""" + self.format = "%s %s" % (self.d_fmt, self.t_fmt) + self.kwargs = {"template": MODE_DATETIME} + + def test_date(self): + """Format a date.""" + self.format = self.d_fmt + self.kwargs = {"template": MODE_DATE} + self.dt = self.dt.date() + + def test_time(self): + """Format times, including float ones.""" + self.format = self.t_fmt + self.kwargs = {"template": MODE_TIME} + self.dt = self.dt.time() + + # Test float times + for n in range(50): + n = n + random() + + # Patch values with >= 24 hours + fmt = self.format.replace("%H", "%02d" % n) + + time = (datetime.datetime.min + + datetime.timedelta(hours=n)).time() + self.assertEqual( + time.strftime(fmt), + self.rl.datetime_formatter(n, **self.kwargs)) + + def test_custom_separator(self): + """Format a datetime with a custom separator.""" + sep = "T" + self.format = "%s%s%s" % (self.d_fmt, sep, self.t_fmt) + self.kwargs = {"template": MODE_DATETIME, "separator": sep} From 996251166dae206dc308e7e8c770abe350916546 Mon Sep 17 00:00:00 2001 From: cubells Date: Tue, 15 Nov 2016 09:48:50 +0100 Subject: [PATCH 2/8] datatime_formatter migration to 9.0 --- datetime_formatter/README.rst | 10 +++------- datetime_formatter/__init__.py | 1 + datetime_formatter/__openerp__.py | 6 ++++-- datetime_formatter/exceptions.py | 1 + datetime_formatter/models.py | 5 +++-- datetime_formatter/tests/__init__.py | 1 + datetime_formatter/tests/test_best_matcher.py | 1 + datetime_formatter/tests/test_formatter.py | 1 + 8 files changed, 15 insertions(+), 11 deletions(-) diff --git a/datetime_formatter/README.rst b/datetime_formatter/README.rst index 46674323f..bf5e28101 100644 --- a/datetime_formatter/README.rst +++ b/datetime_formatter/README.rst @@ -37,7 +37,7 @@ If you are a developer, to use this module, you need to: .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/149/8.0 + :target: https://runbot.odoo-community.org/runbot/149/9.0 Bug Tracker =========== @@ -45,12 +45,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed `feedback -`_. - +help us smashing it by providing a detailed and welcomed feedback. Credits ======= @@ -59,6 +54,7 @@ Contributors ------------ * Jairo Llopis +* Vicent Cubells Maintainer ---------- diff --git a/datetime_formatter/__init__.py b/datetime_formatter/__init__.py index f2586f5d4..e2c3bb8f2 100644 --- a/datetime_formatter/__init__.py +++ b/datetime_formatter/__init__.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- # © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis +# © 2016 Tecnativa, S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/datetime_formatter/__openerp__.py b/datetime_formatter/__openerp__.py index 8e277f5f9..659b241b2 100644 --- a/datetime_formatter/__openerp__.py +++ b/datetime_formatter/__openerp__.py @@ -1,14 +1,16 @@ # -*- coding: utf-8 -*- # © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis +# © 2016 Tecnativa, S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Date & Time Formatter", "summary": "Helper functions to give correct format to date[time] fields", - "version": "8.0.1.0.0", + "version": "9.0.1.0.0", "category": "Tools", - "website": "https://grupoesoc.es", + "website": "https://tecnativa.com", "author": "Grupo ESOC Ingeniería de Servicios, " + "Tecnativa," "Odoo Community Association (OCA)", "license": "AGPL-3", "installable": True, diff --git a/datetime_formatter/exceptions.py b/datetime_formatter/exceptions.py index 9c6c35063..42b5f2850 100644 --- a/datetime_formatter/exceptions.py +++ b/datetime_formatter/exceptions.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis +# © 2016 Tecnativa, S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from openerp import _, exceptions diff --git a/datetime_formatter/models.py b/datetime_formatter/models.py index 6baa92b41..90816df38 100644 --- a/datetime_formatter/models.py +++ b/datetime_formatter/models.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- # © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis +# © 2016 Tecnativa, S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from datetime import datetime, timedelta -from openerp import api, exceptions, fields, models +from openerp import api, fields, models from openerp.tools import (DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_TIME_FORMAT) from . import exceptions as ex @@ -53,7 +54,7 @@ class ResLang(models.Model): try: record.ensure_one() - except exceptions.except_orm: + except ValueError: if not failure_safe: raise ex.BestMatchedLanguageNotFoundError(lang) else: diff --git a/datetime_formatter/tests/__init__.py b/datetime_formatter/tests/__init__.py index ead2fd4e0..e1f602d5d 100644 --- a/datetime_formatter/tests/__init__.py +++ b/datetime_formatter/tests/__init__.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- # © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis +# © 2016 Tecnativa, S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import test_best_matcher, test_formatter diff --git a/datetime_formatter/tests/test_best_matcher.py b/datetime_formatter/tests/test_best_matcher.py index e15bd9757..e022dfd18 100644 --- a/datetime_formatter/tests/test_best_matcher.py +++ b/datetime_formatter/tests/test_best_matcher.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis +# © 2016 Tecnativa, S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from openerp.tests.common import TransactionCase from .. import exceptions diff --git a/datetime_formatter/tests/test_formatter.py b/datetime_formatter/tests/test_formatter.py index 51a4a0fe0..cd3833dca 100644 --- a/datetime_formatter/tests/test_formatter.py +++ b/datetime_formatter/tests/test_formatter.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis +# © 2016 Tecnativa, S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). import datetime from random import random From 136597f557f5da52cb691e2c3b9093dd1bdd3929 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Mon, 30 Nov 2015 15:14:54 -0500 Subject: [PATCH 3/8] OCA Transbot updated translations from Transifex --- datetime_formatter/i18n/ar.po | 30 ++++++++++++++++++++++++++++++ datetime_formatter/i18n/ca.po | 30 ++++++++++++++++++++++++++++++ datetime_formatter/i18n/de.po | 30 ++++++++++++++++++++++++++++++ datetime_formatter/i18n/es.po | 31 +++++++++++++++++++++++++++++++ datetime_formatter/i18n/fr.po | 30 ++++++++++++++++++++++++++++++ datetime_formatter/i18n/it.po | 30 ++++++++++++++++++++++++++++++ datetime_formatter/i18n/sl.po | 30 ++++++++++++++++++++++++++++++ datetime_formatter/i18n/tr.po | 30 ++++++++++++++++++++++++++++++ 8 files changed, 241 insertions(+) create mode 100644 datetime_formatter/i18n/ar.po create mode 100644 datetime_formatter/i18n/ca.po create mode 100644 datetime_formatter/i18n/de.po create mode 100644 datetime_formatter/i18n/es.po create mode 100644 datetime_formatter/i18n/fr.po create mode 100644 datetime_formatter/i18n/it.po create mode 100644 datetime_formatter/i18n/sl.po create mode 100644 datetime_formatter/i18n/tr.po diff --git a/datetime_formatter/i18n/ar.po b/datetime_formatter/i18n/ar.po new file mode 100644 index 000000000..fb74cd3ff --- /dev/null +++ b/datetime_formatter/i18n/ar.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * datetime_formatter +# +# Translators: +# new stargate , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-11-26 01:46+0000\n" +"PO-Revision-Date: 2016-11-26 01:46+0000\n" +"Last-Translator: new stargate , 2016\n" +"Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ar\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" + +#. module: datetime_formatter +#: code:addons/datetime_formatter/exceptions.py:10 +#, python-format +msgid "Best matched language (%s) not found." +msgstr "" + +#. module: datetime_formatter +#: model:ir.model,name:datetime_formatter.model_res_lang +msgid "Languages" +msgstr "اللغات" diff --git a/datetime_formatter/i18n/ca.po b/datetime_formatter/i18n/ca.po new file mode 100644 index 000000000..f15fa9551 --- /dev/null +++ b/datetime_formatter/i18n/ca.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * datetime_formatter +# +# Translators: +# Marc Tormo i Bochaca , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-04-19 18:00+0000\n" +"PO-Revision-Date: 2017-04-19 18:00+0000\n" +"Last-Translator: Marc Tormo i Bochaca , 2017\n" +"Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: datetime_formatter +#: code:addons/datetime_formatter/exceptions.py:10 +#, python-format +msgid "Best matched language (%s) not found." +msgstr "No s'ha trobat la millor associació d'idioma (%s). " + +#. module: datetime_formatter +#: model:ir.model,name:datetime_formatter.model_res_lang +msgid "Languages" +msgstr "Idiomes " diff --git a/datetime_formatter/i18n/de.po b/datetime_formatter/i18n/de.po new file mode 100644 index 000000000..d1493cfc7 --- /dev/null +++ b/datetime_formatter/i18n/de.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * datetime_formatter +# +# Translators: +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-11-26 01:46+0000\n" +"PO-Revision-Date: 2016-11-26 01:46+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: datetime_formatter +#: code:addons/datetime_formatter/exceptions.py:10 +#, python-format +msgid "Best matched language (%s) not found." +msgstr "Sprache (%s) mit bester Übereinstimmung nicht gefunden" + +#. module: datetime_formatter +#: model:ir.model,name:datetime_formatter.model_res_lang +msgid "Languages" +msgstr "Sprachen" diff --git a/datetime_formatter/i18n/es.po b/datetime_formatter/i18n/es.po new file mode 100644 index 000000000..ff58d82b2 --- /dev/null +++ b/datetime_formatter/i18n/es.po @@ -0,0 +1,31 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * datetime_formatter +# +# Translators: +# OCA Transbot , 2016 +# Pedro M. Baeza , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-23 21:53+0000\n" +"PO-Revision-Date: 2016-12-23 21:53+0000\n" +"Last-Translator: Pedro M. Baeza , 2016\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: datetime_formatter +#: code:addons/datetime_formatter/exceptions.py:10 +#, python-format +msgid "Best matched language (%s) not found." +msgstr "No se ha encontrado ningún idioma (%s) que mejor case." + +#. module: datetime_formatter +#: model:ir.model,name:datetime_formatter.model_res_lang +msgid "Languages" +msgstr "Idiomas" diff --git a/datetime_formatter/i18n/fr.po b/datetime_formatter/i18n/fr.po new file mode 100644 index 000000000..555768396 --- /dev/null +++ b/datetime_formatter/i18n/fr.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * datetime_formatter +# +# Translators: +# Christophe CHAUVET , 2016 +msgid "" +msgstr "" +"Project-Id-Version: server-tools (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-08-21 06:45+0000\n" +"PO-Revision-Date: 2016-08-21 07:41+0000\n" +"Last-Translator: Christophe CHAUVET \n" +"Language-Team: French (http://www.transifex.com/oca/OCA-server-tools-8-0/language/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: datetime_formatter +#: code:addons/datetime_formatter/exceptions.py:9 +#, python-format +msgid "Best matched language (%s) not found." +msgstr "" + +#. module: datetime_formatter +#: model:ir.model,name:datetime_formatter.model_res_lang +msgid "Languages" +msgstr "Langues" diff --git a/datetime_formatter/i18n/it.po b/datetime_formatter/i18n/it.po new file mode 100644 index 000000000..d18433dcf --- /dev/null +++ b/datetime_formatter/i18n/it.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * datetime_formatter +# +# Translators: +# Paolo Valier, 2016 +msgid "" +msgstr "" +"Project-Id-Version: server-tools (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-17 15:37+0000\n" +"PO-Revision-Date: 2016-03-13 09:34+0000\n" +"Last-Translator: Paolo Valier\n" +"Language-Team: Italian (http://www.transifex.com/oca/OCA-server-tools-8-0/language/it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: datetime_formatter +#: code:addons/datetime_formatter/exceptions.py:9 +#, python-format +msgid "Best matched language (%s) not found." +msgstr "" + +#. module: datetime_formatter +#: model:ir.model,name:datetime_formatter.model_res_lang +msgid "Languages" +msgstr "Lingue" diff --git a/datetime_formatter/i18n/sl.po b/datetime_formatter/i18n/sl.po new file mode 100644 index 000000000..bc1fb9628 --- /dev/null +++ b/datetime_formatter/i18n/sl.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * datetime_formatter +# +# Translators: +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-11-26 01:46+0000\n" +"PO-Revision-Date: 2016-11-26 01:46+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#. module: datetime_formatter +#: code:addons/datetime_formatter/exceptions.py:10 +#, python-format +msgid "Best matched language (%s) not found." +msgstr "Najbolj ujemajoč jezik (%s) ni najden." + +#. module: datetime_formatter +#: model:ir.model,name:datetime_formatter.model_res_lang +msgid "Languages" +msgstr "Jeziki" diff --git a/datetime_formatter/i18n/tr.po b/datetime_formatter/i18n/tr.po new file mode 100644 index 000000000..c745960dc --- /dev/null +++ b/datetime_formatter/i18n/tr.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * datetime_formatter +# +# Translators: +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-11-26 01:46+0000\n" +"PO-Revision-Date: 2016-11-26 01:46+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: tr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: datetime_formatter +#: code:addons/datetime_formatter/exceptions.py:10 +#, python-format +msgid "Best matched language (%s) not found." +msgstr "En iyi eşleşen dil (%s) bulunamadı." + +#. module: datetime_formatter +#: model:ir.model,name:datetime_formatter.model_res_lang +msgid "Languages" +msgstr "Diller" From d1eecb08297bd4e801a4d94fd39412332e72b64e Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Thu, 22 Jun 2017 12:42:48 +0200 Subject: [PATCH 4/8] [MIG][10.0][datetime_formatter] Migration Special highlights: - Fixed some license headers. - Adhered to normal addon structure. - Removed `exceptions.py` and use `UserError` instead. - Allow submodules to import some constants from main namespace. The rest is basically a standard migration. --- datetime_formatter/README.rst | 2 +- datetime_formatter/__init__.py | 4 ++-- .../{__openerp__.py => __manifest__.py} | 8 ++++---- datetime_formatter/exceptions.py | 12 ------------ datetime_formatter/models/__init__.py | 3 +++ .../{models.py => models/res_lang.py} | 16 +++++++++------- datetime_formatter/tests/__init__.py | 2 -- datetime_formatter/tests/test_best_matcher.py | 10 +++++----- datetime_formatter/tests/test_formatter.py | 14 +++++++------- 9 files changed, 31 insertions(+), 40 deletions(-) rename datetime_formatter/{__openerp__.py => __manifest__.py} (70%) delete mode 100644 datetime_formatter/exceptions.py create mode 100644 datetime_formatter/models/__init__.py rename datetime_formatter/{models.py => models/res_lang.py} (90%) diff --git a/datetime_formatter/README.rst b/datetime_formatter/README.rst index bf5e28101..9c777e60f 100644 --- a/datetime_formatter/README.rst +++ b/datetime_formatter/README.rst @@ -37,7 +37,7 @@ If you are a developer, to use this module, you need to: .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/149/9.0 + :target: https://runbot.odoo-community.org/runbot/149/10.0 Bug Tracker =========== diff --git a/datetime_formatter/__init__.py b/datetime_formatter/__init__.py index e2c3bb8f2..491851786 100644 --- a/datetime_formatter/__init__.py +++ b/datetime_formatter/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis -# © 2016 Tecnativa, S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models +# Make these easily available for submodules +from .models.res_lang import MODE_DATE, MODE_DATETIME, MODE_TIME diff --git a/datetime_formatter/__openerp__.py b/datetime_formatter/__manifest__.py similarity index 70% rename from datetime_formatter/__openerp__.py rename to datetime_formatter/__manifest__.py index 659b241b2..ac84cc5b3 100644 --- a/datetime_formatter/__openerp__.py +++ b/datetime_formatter/__manifest__.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- -# © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis -# © 2016 Tecnativa, S.L. - Vicent Cubells +# Copyright 2015, 2017 Jairo Llopis +# Copyright 2016 Tecnativa, S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Date & Time Formatter", "summary": "Helper functions to give correct format to date[time] fields", - "version": "9.0.1.0.0", + "version": "10.0.1.0.0", "category": "Tools", - "website": "https://tecnativa.com", + "website": "https://www.tecnativa.com", "author": "Grupo ESOC Ingeniería de Servicios, " "Tecnativa," "Odoo Community Association (OCA)", diff --git a/datetime_formatter/exceptions.py b/datetime_formatter/exceptions.py deleted file mode 100644 index 42b5f2850..000000000 --- a/datetime_formatter/exceptions.py +++ /dev/null @@ -1,12 +0,0 @@ -# -*- coding: utf-8 -*- -# © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis -# © 2016 Tecnativa, S.L. - Vicent Cubells -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import _, exceptions - - -class BestMatchedLanguageNotFoundError(exceptions.MissingError): - def __init__(self, lang): - msg = (_("Best matched language (%s) not found.") % lang) - super(BestMatchedLanguageNotFoundError, self).__init__(msg) - self.lang = lang diff --git a/datetime_formatter/models/__init__.py b/datetime_formatter/models/__init__.py new file mode 100644 index 000000000..30cac48d5 --- /dev/null +++ b/datetime_formatter/models/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import res_lang diff --git a/datetime_formatter/models.py b/datetime_formatter/models/res_lang.py similarity index 90% rename from datetime_formatter/models.py rename to datetime_formatter/models/res_lang.py index 90816df38..9d3ced04a 100644 --- a/datetime_formatter/models.py +++ b/datetime_formatter/models/res_lang.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -# © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis -# © 2016 Tecnativa, S.L. - Vicent Cubells +# Copyright 2015, 2017 Jairo Llopis +# Copyright 2016 Tecnativa, S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from datetime import datetime, timedelta -from openerp import api, fields, models -from openerp.tools import (DEFAULT_SERVER_DATE_FORMAT, - DEFAULT_SERVER_TIME_FORMAT) -from . import exceptions as ex +from odoo import _, api, fields, models +from odoo.tools import (DEFAULT_SERVER_DATE_FORMAT, + DEFAULT_SERVER_TIME_FORMAT) +from odoo.exceptions import UserError # Available modes for :param:`.ResLang.datetime_formatter.template` MODE_DATETIME = "MODE_DATETIME" @@ -56,7 +56,9 @@ class ResLang(models.Model): record.ensure_one() except ValueError: if not failure_safe: - raise ex.BestMatchedLanguageNotFoundError(lang) + raise UserError( + _("Best matched language (%s) not found.") % lang + ) else: record = first_installed diff --git a/datetime_formatter/tests/__init__.py b/datetime_formatter/tests/__init__.py index e1f602d5d..0192d242f 100644 --- a/datetime_formatter/tests/__init__.py +++ b/datetime_formatter/tests/__init__.py @@ -1,5 +1,3 @@ # -*- coding: utf-8 -*- -# © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis -# © 2016 Tecnativa, S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import test_best_matcher, test_formatter diff --git a/datetime_formatter/tests/test_best_matcher.py b/datetime_formatter/tests/test_best_matcher.py index e022dfd18..790c70d58 100644 --- a/datetime_formatter/tests/test_best_matcher.py +++ b/datetime_formatter/tests/test_best_matcher.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis -# © 2016 Tecnativa, S.L. - Vicent Cubells +# Copyright 2015, 2017 Jairo Llopis +# Copyright 2016 Tecnativa, S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp.tests.common import TransactionCase -from .. import exceptions +from odoo.tests.common import TransactionCase +from odoo.exceptions import UserError class BasicCase(TransactionCase): @@ -72,5 +72,5 @@ class BasicCase(TransactionCase): self.assertEqual(self.rl.best_match("fake_LANG").code, first.code) # Unsafe mode - with self.assertRaises(exceptions.BestMatchedLanguageNotFoundError): + with self.assertRaises(UserError): self.rl.best_match("fake_LANG", failure_safe=False) diff --git a/datetime_formatter/tests/test_formatter.py b/datetime_formatter/tests/test_formatter.py index cd3833dca..1fa451202 100644 --- a/datetime_formatter/tests/test_formatter.py +++ b/datetime_formatter/tests/test_formatter.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- -# © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. - Jairo Llopis -# © 2016 Tecnativa, S.L. - Vicent Cubells +# Copyright 2015, 2017 Jairo Llopis +# Copyright 2016 Tecnativa, S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). import datetime from random import random -from openerp.tests.common import TransactionCase -from openerp.tools import (DEFAULT_SERVER_DATE_FORMAT, - DEFAULT_SERVER_TIME_FORMAT, - DEFAULT_SERVER_DATETIME_FORMAT) -from ..models import MODE_DATE, MODE_TIME, MODE_DATETIME +from odoo.tests.common import TransactionCase +from odoo.tools import (DEFAULT_SERVER_DATE_FORMAT, + DEFAULT_SERVER_TIME_FORMAT, + DEFAULT_SERVER_DATETIME_FORMAT) +from ..models.res_lang import MODE_DATE, MODE_TIME, MODE_DATETIME class FormatterCase(TransactionCase): From f0eab536846acd37e5eb3f67465c20f194d5520b Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 1 Jul 2017 10:28:01 +0200 Subject: [PATCH 5/8] OCA Transbot updated translations from Transifex --- datetime_formatter/i18n/ca.po | 12 ++++++------ datetime_formatter/i18n/de.po | 12 ++++++------ datetime_formatter/i18n/es.po | 13 ++++++------- datetime_formatter/i18n/hr.po | 30 ++++++++++++++++++++++++++++++ datetime_formatter/i18n/nl_NL.po | 30 ++++++++++++++++++++++++++++++ datetime_formatter/i18n/sl.po | 12 ++++++------ datetime_formatter/i18n/tr.po | 12 ++++++------ 7 files changed, 90 insertions(+), 31 deletions(-) create mode 100644 datetime_formatter/i18n/hr.po create mode 100644 datetime_formatter/i18n/nl_NL.po diff --git a/datetime_formatter/i18n/ca.po b/datetime_formatter/i18n/ca.po index f15fa9551..cf742d536 100644 --- a/datetime_formatter/i18n/ca.po +++ b/datetime_formatter/i18n/ca.po @@ -3,14 +3,14 @@ # * datetime_formatter # # Translators: -# Marc Tormo i Bochaca , 2017 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-19 18:00+0000\n" -"PO-Revision-Date: 2017-04-19 18:00+0000\n" -"Last-Translator: Marc Tormo i Bochaca , 2017\n" +"POT-Creation-Date: 2017-06-30 12:21+0000\n" +"PO-Revision-Date: 2017-06-30 12:21+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: datetime_formatter -#: code:addons/datetime_formatter/exceptions.py:10 +#: code:addons/datetime_formatter/models/res_lang.py:60 #, python-format msgid "Best matched language (%s) not found." msgstr "No s'ha trobat la millor associació d'idioma (%s). " diff --git a/datetime_formatter/i18n/de.po b/datetime_formatter/i18n/de.po index d1493cfc7..201faf7d3 100644 --- a/datetime_formatter/i18n/de.po +++ b/datetime_formatter/i18n/de.po @@ -3,14 +3,14 @@ # * datetime_formatter # # Translators: -# OCA Transbot , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-26 01:46+0000\n" -"PO-Revision-Date: 2016-11-26 01:46+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"POT-Creation-Date: 2017-06-30 12:21+0000\n" +"PO-Revision-Date: 2017-06-30 12:21+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: datetime_formatter -#: code:addons/datetime_formatter/exceptions.py:10 +#: code:addons/datetime_formatter/models/res_lang.py:60 #, python-format msgid "Best matched language (%s) not found." msgstr "Sprache (%s) mit bester Übereinstimmung nicht gefunden" diff --git a/datetime_formatter/i18n/es.po b/datetime_formatter/i18n/es.po index ff58d82b2..e6662904a 100644 --- a/datetime_formatter/i18n/es.po +++ b/datetime_formatter/i18n/es.po @@ -3,15 +3,14 @@ # * datetime_formatter # # Translators: -# OCA Transbot , 2016 -# Pedro M. Baeza , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-23 21:53+0000\n" -"PO-Revision-Date: 2016-12-23 21:53+0000\n" -"Last-Translator: Pedro M. Baeza , 2016\n" +"POT-Creation-Date: 2017-06-30 12:21+0000\n" +"PO-Revision-Date: 2017-06-30 12:21+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: datetime_formatter -#: code:addons/datetime_formatter/exceptions.py:10 +#: code:addons/datetime_formatter/models/res_lang.py:60 #, python-format msgid "Best matched language (%s) not found." msgstr "No se ha encontrado ningún idioma (%s) que mejor case." diff --git a/datetime_formatter/i18n/hr.po b/datetime_formatter/i18n/hr.po new file mode 100644 index 000000000..e4b59d50f --- /dev/null +++ b/datetime_formatter/i18n/hr.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * datetime_formatter +# +# Translators: +# Goran Kliska , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-30 12:21+0000\n" +"PO-Revision-Date: 2017-06-30 12:21+0000\n" +"Last-Translator: Goran Kliska , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: datetime_formatter +#: code:addons/datetime_formatter/models/res_lang.py:60 +#, python-format +msgid "Best matched language (%s) not found." +msgstr "" + +#. module: datetime_formatter +#: model:ir.model,name:datetime_formatter.model_res_lang +msgid "Languages" +msgstr "Jezici" diff --git a/datetime_formatter/i18n/nl_NL.po b/datetime_formatter/i18n/nl_NL.po new file mode 100644 index 000000000..31b3cecb2 --- /dev/null +++ b/datetime_formatter/i18n/nl_NL.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * datetime_formatter +# +# Translators: +# Peter Hageman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-30 12:21+0000\n" +"PO-Revision-Date: 2017-06-30 12:21+0000\n" +"Last-Translator: Peter Hageman , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: datetime_formatter +#: code:addons/datetime_formatter/models/res_lang.py:60 +#, python-format +msgid "Best matched language (%s) not found." +msgstr "Best overeenkomende taal (%s) niet gevonden." + +#. module: datetime_formatter +#: model:ir.model,name:datetime_formatter.model_res_lang +msgid "Languages" +msgstr "Talen" diff --git a/datetime_formatter/i18n/sl.po b/datetime_formatter/i18n/sl.po index bc1fb9628..100242714 100644 --- a/datetime_formatter/i18n/sl.po +++ b/datetime_formatter/i18n/sl.po @@ -3,14 +3,14 @@ # * datetime_formatter # # Translators: -# OCA Transbot , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-26 01:46+0000\n" -"PO-Revision-Date: 2016-11-26 01:46+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"POT-Creation-Date: 2017-06-30 12:21+0000\n" +"PO-Revision-Date: 2017-06-30 12:21+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" #. module: datetime_formatter -#: code:addons/datetime_formatter/exceptions.py:10 +#: code:addons/datetime_formatter/models/res_lang.py:60 #, python-format msgid "Best matched language (%s) not found." msgstr "Najbolj ujemajoč jezik (%s) ni najden." diff --git a/datetime_formatter/i18n/tr.po b/datetime_formatter/i18n/tr.po index c745960dc..f0f72e3b0 100644 --- a/datetime_formatter/i18n/tr.po +++ b/datetime_formatter/i18n/tr.po @@ -3,14 +3,14 @@ # * datetime_formatter # # Translators: -# OCA Transbot , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-26 01:46+0000\n" -"PO-Revision-Date: 2016-11-26 01:46+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"POT-Creation-Date: 2017-06-30 12:21+0000\n" +"PO-Revision-Date: 2017-06-30 12:21+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: datetime_formatter -#: code:addons/datetime_formatter/exceptions.py:10 +#: code:addons/datetime_formatter/models/res_lang.py:60 #, python-format msgid "Best matched language (%s) not found." msgstr "En iyi eşleşen dil (%s) bulunamadı." From b817bd6b4baeaae30a343f327c42a5ebe66a2030 Mon Sep 17 00:00:00 2001 From: oleksandrpaziuk Date: Tue, 16 Jan 2018 15:01:27 +0200 Subject: [PATCH 6/8] [MIG] datetime_formatter: Migration to 11.0 --- datetime_formatter/README.rst | 2 +- datetime_formatter/__init__.py | 1 - datetime_formatter/__manifest__.py | 4 ++-- datetime_formatter/models/__init__.py | 1 - datetime_formatter/models/res_lang.py | 3 +-- datetime_formatter/tests/__init__.py | 1 - datetime_formatter/tests/test_best_matcher.py | 3 +-- datetime_formatter/tests/test_formatter.py | 7 +++---- 8 files changed, 8 insertions(+), 14 deletions(-) diff --git a/datetime_formatter/README.rst b/datetime_formatter/README.rst index 9c777e60f..9c0ef02f1 100644 --- a/datetime_formatter/README.rst +++ b/datetime_formatter/README.rst @@ -37,7 +37,7 @@ If you are a developer, to use this module, you need to: .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/149/10.0 + :target: https://runbot.odoo-community.org/runbot/149/11.0 Bug Tracker =========== diff --git a/datetime_formatter/__init__.py b/datetime_formatter/__init__.py index 491851786..9b1f9857f 100644 --- a/datetime_formatter/__init__.py +++ b/datetime_formatter/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models # Make these easily available for submodules diff --git a/datetime_formatter/__manifest__.py b/datetime_formatter/__manifest__.py index ac84cc5b3..59a27dece 100644 --- a/datetime_formatter/__manifest__.py +++ b/datetime_formatter/__manifest__.py @@ -1,12 +1,12 @@ -# -*- coding: utf-8 -*- # Copyright 2015, 2017 Jairo Llopis # Copyright 2016 Tecnativa, S.L. - Vicent Cubells +# Copyright 2018 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Date & Time Formatter", "summary": "Helper functions to give correct format to date[time] fields", - "version": "10.0.1.0.0", + "version": "11.0.1.0.0", "category": "Tools", "website": "https://www.tecnativa.com", "author": "Grupo ESOC Ingeniería de Servicios, " diff --git a/datetime_formatter/models/__init__.py b/datetime_formatter/models/__init__.py index 30cac48d5..c2af0613e 100644 --- a/datetime_formatter/models/__init__.py +++ b/datetime_formatter/models/__init__.py @@ -1,3 +1,2 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import res_lang diff --git a/datetime_formatter/models/res_lang.py b/datetime_formatter/models/res_lang.py index 9d3ced04a..de94a79c5 100644 --- a/datetime_formatter/models/res_lang.py +++ b/datetime_formatter/models/res_lang.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2015, 2017 Jairo Llopis # Copyright 2016 Tecnativa, S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -104,7 +103,7 @@ class ResLang(models.Model): template = separator.join(defaults) # Convert str to datetime objects - if isinstance(value, (str, unicode)): + if isinstance(value, str): try: value = fields.Datetime.from_string(value) except ValueError: diff --git a/datetime_formatter/tests/__init__.py b/datetime_formatter/tests/__init__.py index 0192d242f..3ce04bff3 100644 --- a/datetime_formatter/tests/__init__.py +++ b/datetime_formatter/tests/__init__.py @@ -1,3 +1,2 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import test_best_matcher, test_formatter diff --git a/datetime_formatter/tests/test_best_matcher.py b/datetime_formatter/tests/test_best_matcher.py index 790c70d58..c67560585 100644 --- a/datetime_formatter/tests/test_best_matcher.py +++ b/datetime_formatter/tests/test_best_matcher.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2015, 2017 Jairo Llopis # Copyright 2016 Tecnativa, S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -8,7 +7,7 @@ from odoo.exceptions import UserError class BasicCase(TransactionCase): def setUp(self): - super(BasicCase, self).setUp() + super().setUp() self.langs = ("en_US", "es_ES", "it_IT", "pt_PT", "zh_CN") self.rl = self.env["res.lang"] for lang in self.langs: diff --git a/datetime_formatter/tests/test_formatter.py b/datetime_formatter/tests/test_formatter.py index 1fa451202..dd0024ad7 100644 --- a/datetime_formatter/tests/test_formatter.py +++ b/datetime_formatter/tests/test_formatter.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2015, 2017 Jairo Llopis # Copyright 2016 Tecnativa, S.L. - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -13,7 +12,7 @@ from ..models.res_lang import MODE_DATE, MODE_TIME, MODE_DATETIME class FormatterCase(TransactionCase): def setUp(self): - super(FormatterCase, self).setUp() + super().setUp() self.rl = self.env["res.lang"] self.bm = self.rl.best_match() self.dt = datetime.datetime.now() @@ -51,10 +50,10 @@ class FormatterCase(TransactionCase): self.assertEqual( self.expected, self.rl.datetime_formatter( - unicode(self.dt_str), + str(self.dt_str), **self.kwargs)) - super(FormatterCase, self).tearDown() + super().tearDown() def test_datetime(self): """Format a datetime.""" From 2852924ed712c49f77c386233afcb74517a9609d Mon Sep 17 00:00:00 2001 From: oca-travis Date: Sun, 17 Jun 2018 20:50:50 +0000 Subject: [PATCH 7/8] [UPD] Update datetime_formatter.pot --- datetime_formatter/i18n/ar.po | 9 ++++--- datetime_formatter/i18n/ca.po | 6 ++--- .../i18n/datetime_formatter.pot | 26 +++++++++++++++++++ datetime_formatter/i18n/de.po | 6 ++--- datetime_formatter/i18n/es.po | 6 ++--- datetime_formatter/i18n/fr.po | 9 ++++--- datetime_formatter/i18n/hr.po | 9 ++++--- datetime_formatter/i18n/it.po | 9 ++++--- datetime_formatter/i18n/nl_NL.po | 9 ++++--- datetime_formatter/i18n/sl.po | 9 ++++--- datetime_formatter/i18n/tr.po | 6 ++--- 11 files changed, 68 insertions(+), 36 deletions(-) create mode 100644 datetime_formatter/i18n/datetime_formatter.pot diff --git a/datetime_formatter/i18n/ar.po b/datetime_formatter/i18n/ar.po index fb74cd3ff..d301dd6fd 100644 --- a/datetime_formatter/i18n/ar.po +++ b/datetime_formatter/i18n/ar.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * datetime_formatter -# +# # Translators: # new stargate , 2016 msgid "" @@ -12,14 +12,15 @@ msgstr "" "PO-Revision-Date: 2016-11-26 01:46+0000\n" "Last-Translator: new stargate , 2016\n" "Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ar\n" -"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" #. module: datetime_formatter -#: code:addons/datetime_formatter/exceptions.py:10 +#: code:addons/datetime_formatter/models/res_lang.py:59 #, python-format msgid "Best matched language (%s) not found." msgstr "" diff --git a/datetime_formatter/i18n/ca.po b/datetime_formatter/i18n/ca.po index cf742d536..119ff9eaf 100644 --- a/datetime_formatter/i18n/ca.po +++ b/datetime_formatter/i18n/ca.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * datetime_formatter -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,14 +12,14 @@ msgstr "" "PO-Revision-Date: 2017-06-30 12:21+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: datetime_formatter -#: code:addons/datetime_formatter/models/res_lang.py:60 +#: code:addons/datetime_formatter/models/res_lang.py:59 #, python-format msgid "Best matched language (%s) not found." msgstr "No s'ha trobat la millor associació d'idioma (%s). " diff --git a/datetime_formatter/i18n/datetime_formatter.pot b/datetime_formatter/i18n/datetime_formatter.pot new file mode 100644 index 000000000..981fc4061 --- /dev/null +++ b/datetime_formatter/i18n/datetime_formatter.pot @@ -0,0 +1,26 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * datetime_formatter +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: datetime_formatter +#: code:addons/datetime_formatter/models/res_lang.py:59 +#, python-format +msgid "Best matched language (%s) not found." +msgstr "" + +#. module: datetime_formatter +#: model:ir.model,name:datetime_formatter.model_res_lang +msgid "Languages" +msgstr "" + diff --git a/datetime_formatter/i18n/de.po b/datetime_formatter/i18n/de.po index 201faf7d3..65b024f50 100644 --- a/datetime_formatter/i18n/de.po +++ b/datetime_formatter/i18n/de.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * datetime_formatter -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,14 +12,14 @@ msgstr "" "PO-Revision-Date: 2017-06-30 12:21+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: datetime_formatter -#: code:addons/datetime_formatter/models/res_lang.py:60 +#: code:addons/datetime_formatter/models/res_lang.py:59 #, python-format msgid "Best matched language (%s) not found." msgstr "Sprache (%s) mit bester Übereinstimmung nicht gefunden" diff --git a/datetime_formatter/i18n/es.po b/datetime_formatter/i18n/es.po index e6662904a..5e11425f3 100644 --- a/datetime_formatter/i18n/es.po +++ b/datetime_formatter/i18n/es.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * datetime_formatter -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,14 +12,14 @@ msgstr "" "PO-Revision-Date: 2017-06-30 12:21+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: datetime_formatter -#: code:addons/datetime_formatter/models/res_lang.py:60 +#: code:addons/datetime_formatter/models/res_lang.py:59 #, python-format msgid "Best matched language (%s) not found." msgstr "No se ha encontrado ningún idioma (%s) que mejor case." diff --git a/datetime_formatter/i18n/fr.po b/datetime_formatter/i18n/fr.po index 555768396..679d7ac95 100644 --- a/datetime_formatter/i18n/fr.po +++ b/datetime_formatter/i18n/fr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * datetime_formatter -# +# # Translators: # Christophe CHAUVET , 2016 msgid "" @@ -11,15 +11,16 @@ msgstr "" "POT-Creation-Date: 2016-08-21 06:45+0000\n" "PO-Revision-Date: 2016-08-21 07:41+0000\n" "Last-Translator: Christophe CHAUVET \n" -"Language-Team: French (http://www.transifex.com/oca/OCA-server-tools-8-0/language/fr/)\n" +"Language-Team: French (http://www.transifex.com/oca/OCA-server-tools-8-0/" +"language/fr/)\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: datetime_formatter -#: code:addons/datetime_formatter/exceptions.py:9 +#: code:addons/datetime_formatter/models/res_lang.py:59 #, python-format msgid "Best matched language (%s) not found." msgstr "" diff --git a/datetime_formatter/i18n/hr.po b/datetime_formatter/i18n/hr.po index e4b59d50f..23d2a303e 100644 --- a/datetime_formatter/i18n/hr.po +++ b/datetime_formatter/i18n/hr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * datetime_formatter -# +# # Translators: # Goran Kliska , 2017 msgid "" @@ -12,14 +12,15 @@ msgstr "" "PO-Revision-Date: 2017-06-30 12:21+0000\n" "Last-Translator: Goran Kliska , 2017\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: datetime_formatter -#: code:addons/datetime_formatter/models/res_lang.py:60 +#: code:addons/datetime_formatter/models/res_lang.py:59 #, python-format msgid "Best matched language (%s) not found." msgstr "" diff --git a/datetime_formatter/i18n/it.po b/datetime_formatter/i18n/it.po index d18433dcf..f9e80b2c6 100644 --- a/datetime_formatter/i18n/it.po +++ b/datetime_formatter/i18n/it.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * datetime_formatter -# +# # Translators: # Paolo Valier, 2016 msgid "" @@ -11,15 +11,16 @@ msgstr "" "POT-Creation-Date: 2016-03-17 15:37+0000\n" "PO-Revision-Date: 2016-03-13 09:34+0000\n" "Last-Translator: Paolo Valier\n" -"Language-Team: Italian (http://www.transifex.com/oca/OCA-server-tools-8-0/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/oca/OCA-server-tools-8-0/" +"language/it/)\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: datetime_formatter -#: code:addons/datetime_formatter/exceptions.py:9 +#: code:addons/datetime_formatter/models/res_lang.py:59 #, python-format msgid "Best matched language (%s) not found." msgstr "" diff --git a/datetime_formatter/i18n/nl_NL.po b/datetime_formatter/i18n/nl_NL.po index 31b3cecb2..4141a5a95 100644 --- a/datetime_formatter/i18n/nl_NL.po +++ b/datetime_formatter/i18n/nl_NL.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * datetime_formatter -# +# # Translators: # Peter Hageman , 2017 msgid "" @@ -11,15 +11,16 @@ msgstr "" "POT-Creation-Date: 2017-06-30 12:21+0000\n" "PO-Revision-Date: 2017-06-30 12:21+0000\n" "Last-Translator: Peter Hageman , 2017\n" -"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/" +"teams/23907/nl_NL/)\n" +"Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nl_NL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: datetime_formatter -#: code:addons/datetime_formatter/models/res_lang.py:60 +#: code:addons/datetime_formatter/models/res_lang.py:59 #, python-format msgid "Best matched language (%s) not found." msgstr "Best overeenkomende taal (%s) niet gevonden." diff --git a/datetime_formatter/i18n/sl.po b/datetime_formatter/i18n/sl.po index 100242714..a92230fdd 100644 --- a/datetime_formatter/i18n/sl.po +++ b/datetime_formatter/i18n/sl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * datetime_formatter -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,14 +12,15 @@ msgstr "" "PO-Revision-Date: 2017-06-30 12:21+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" #. module: datetime_formatter -#: code:addons/datetime_formatter/models/res_lang.py:60 +#: code:addons/datetime_formatter/models/res_lang.py:59 #, python-format msgid "Best matched language (%s) not found." msgstr "Najbolj ujemajoč jezik (%s) ni najden." diff --git a/datetime_formatter/i18n/tr.po b/datetime_formatter/i18n/tr.po index f0f72e3b0..d555a1f7e 100644 --- a/datetime_formatter/i18n/tr.po +++ b/datetime_formatter/i18n/tr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * datetime_formatter -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,14 +12,14 @@ msgstr "" "PO-Revision-Date: 2017-06-30 12:21+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: datetime_formatter -#: code:addons/datetime_formatter/models/res_lang.py:60 +#: code:addons/datetime_formatter/models/res_lang.py:59 #, python-format msgid "Best matched language (%s) not found." msgstr "En iyi eşleşen dil (%s) bulunamadı." From 9a0cbc1bef05648ea68c217956f4ecda9ec3017d Mon Sep 17 00:00:00 2001 From: ernesto Date: Fri, 1 Feb 2019 10:55:06 -0500 Subject: [PATCH 8/8] [MIG] datetime_formatter: Migration to 12.0 --- datetime_formatter/README.rst | 73 ++- datetime_formatter/__manifest__.py | 6 +- datetime_formatter/models/res_lang.py | 2 +- datetime_formatter/readme/CONTRIBUTORS.rst | 5 + datetime_formatter/readme/DESCRIPTION.rst | 3 + datetime_formatter/readme/USAGE.rst | 21 + .../static/description/index.html | 456 ++++++++++++++++++ 7 files changed, 542 insertions(+), 24 deletions(-) create mode 100644 datetime_formatter/readme/CONTRIBUTORS.rst create mode 100644 datetime_formatter/readme/DESCRIPTION.rst create mode 100644 datetime_formatter/readme/USAGE.rst create mode 100644 datetime_formatter/static/description/index.html diff --git a/datetime_formatter/README.rst b/datetime_formatter/README.rst index 9c0ef02f1..358083258 100644 --- a/datetime_formatter/README.rst +++ b/datetime_formatter/README.rst @@ -1,15 +1,39 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - ===================== Date & Time Formatter ===================== +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--tools-lightgray.png?logo=github + :target: https://github.com/OCA/server-tools/tree/12.0/datetime_formatter + :alt: OCA/server-tools +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/server-tools-12-0/server-tools-12-0-datetime_formatter + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/149/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + This module was written to extend the functionality of Odoo language engine to support formatting `Date`, `Time` and `Datetime` fields easily and allow you to print them in the best format for the user. +**Table of contents** + +.. contents:: + :local: + Usage ===== @@ -35,38 +59,47 @@ If you are a developer, to use this module, you need to: * ``models.ResLang.datetime_formatter`` docstring explains its usage. -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/149/11.0 - Bug Tracker =========== -Bugs are tracked on `GitHub Issues -`_. In case of trouble, please -check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed feedback. +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= +Authors +~~~~~~~ + +* Grupo ESOC Ingeniería de Servicios +* Tecnativa + Contributors ------------- +~~~~~~~~~~~~ + +* `Tecnativa `_: -* Jairo Llopis -* Vicent Cubells + * Jairo Llopis + * Vicent Cubells + * Ernesto Tejeda -Maintainer ----------- +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit http://odoo-community.org. +This module is part of the `OCA/server-tools `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/datetime_formatter/__manifest__.py b/datetime_formatter/__manifest__.py index 59a27dece..c5cb99912 100644 --- a/datetime_formatter/__manifest__.py +++ b/datetime_formatter/__manifest__.py @@ -6,11 +6,11 @@ { "name": "Date & Time Formatter", "summary": "Helper functions to give correct format to date[time] fields", - "version": "11.0.1.0.0", + "version": "12.0.1.0.0", "category": "Tools", - "website": "https://www.tecnativa.com", + "website": "https://github.com/OCA/server-tools", "author": "Grupo ESOC Ingeniería de Servicios, " - "Tecnativa," + "Tecnativa, " "Odoo Community Association (OCA)", "license": "AGPL-3", "installable": True, diff --git a/datetime_formatter/models/res_lang.py b/datetime_formatter/models/res_lang.py index de94a79c5..66b9eece1 100644 --- a/datetime_formatter/models/res_lang.py +++ b/datetime_formatter/models/res_lang.py @@ -105,7 +105,7 @@ class ResLang(models.Model): # Convert str to datetime objects if isinstance(value, str): try: - value = fields.Datetime.from_string(value) + value = fields.Datetime.to_datetime(value) except ValueError: # Probably failed due to value being only time value = datetime.strptime(value, DEFAULT_SERVER_TIME_FORMAT) diff --git a/datetime_formatter/readme/CONTRIBUTORS.rst b/datetime_formatter/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..281c29e28 --- /dev/null +++ b/datetime_formatter/readme/CONTRIBUTORS.rst @@ -0,0 +1,5 @@ +* `Tecnativa `_: + + * Jairo Llopis + * Vicent Cubells + * Ernesto Tejeda diff --git a/datetime_formatter/readme/DESCRIPTION.rst b/datetime_formatter/readme/DESCRIPTION.rst new file mode 100644 index 000000000..785e26bc8 --- /dev/null +++ b/datetime_formatter/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +This module was written to extend the functionality of Odoo language engine to +support formatting `Date`, `Time` and `Datetime` fields easily and allow you to +print them in the best format for the user. diff --git a/datetime_formatter/readme/USAGE.rst b/datetime_formatter/readme/USAGE.rst new file mode 100644 index 000000000..e461738d8 --- /dev/null +++ b/datetime_formatter/readme/USAGE.rst @@ -0,0 +1,21 @@ +This module adds a technical programming feature, and it should be used by +addon developers, not by end users. This means that you must not expect to see +any changes if you are a user and install this, but if you find you have it +already installed, it's probably because you have another modules that depend +on this one. + +If you are a developer, to use this module, you need to: + +* Call anywhere in your code:: + + formatted_string = self.env["res.lang"].datetime_formatter(datetime_value) + +* If you use Qweb:: + + + +* If you call it from a record that has a `lang` field:: + + formatted_string = record.lang.datetime_formatter(record.datetime_field) + +* ``models.ResLang.datetime_formatter`` docstring explains its usage. diff --git a/datetime_formatter/static/description/index.html b/datetime_formatter/static/description/index.html new file mode 100644 index 000000000..f2c137f53 --- /dev/null +++ b/datetime_formatter/static/description/index.html @@ -0,0 +1,456 @@ + + + + + + +Date & Time Formatter + + + +
+

Date & Time Formatter

+ + +

Beta License: AGPL-3 OCA/server-tools Translate me on Weblate Try me on Runbot

+

This module was written to extend the functionality of Odoo language engine to +support formatting Date, Time and Datetime fields easily and allow you to +print them in the best format for the user.

+

Table of contents

+ +
+

Usage

+

This module adds a technical programming feature, and it should be used by +addon developers, not by end users. This means that you must not expect to see +any changes if you are a user and install this, but if you find you have it +already installed, it’s probably because you have another modules that depend +on this one.

+

If you are a developer, to use this module, you need to:

+
    +

  • Call anywhere in your code:

    +
    +formatted_string = self.env["res.lang"].datetime_formatter(datetime_value)
+
    +
    • +

  • If you use Qweb:

    +
    +<t t-esc="env['res.lang'].datetime_formatter(datetime_value)"/>
+
    +
    • +

  • If you call it from a record that has a lang field:

    +
    +formatted_string = record.lang.datetime_formatter(record.datetime_field)
+
    +
    • +

  • models.ResLang.datetime_formatter docstring explains its usage.

    +
    • +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Grupo ESOC Ingeniería de Servicios
    • +
  • Tecnativa
    • +
+
+
+

Contributors

+
    +
  • Tecnativa:
      +
    • Jairo Llopis
      • +
    • Vicent Cubells
      • +
    • Ernesto Tejeda
      • +
    +
    • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/server-tools project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ +