[tryton-debian-vcs] tryton-modules-google-maps branch debian updated. debian/4.0.2-1-2-g905a237
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Dec 6 15:58:43 UTC 2016
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-google-maps.git;a=commitdiff;h=debian/4.0.2-1-2-g905a237
commit 905a23711fdd36a385c36d4c18aaf00909ea6711
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Dec 6 10:58:16 2016 +0100
Releasing debian version 4.2.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 820d930..7818b9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-google-maps (4.2.0-1) unstable; urgency=medium
+
+ * Merging upstream version 4.2.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 05 Dec 2016 15:31:20 +0100
+
tryton-modules-google-maps (4.0.2-1) unstable; urgency=medium
* Updating to Standards-Version: 3.9.8, no changes needed.
commit c6bdc9b13a640caaeeb568bd6313972d507b5edb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 5 09:34:29 2016 +0100
Merging upstream version 4.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index b1b7f07..5fddd7d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,4 @@
-Version 4.0.2 - 2016-09-03
-* Bug fixes (see mercurial logs for details)
-
-Version 4.0.1 - 2016-05-11
+Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
Version 4.0.0 - 2016-05-02
diff --git a/INSTALL b/INSTALL
index 78048ee..b80ea47 100644
--- a/INSTALL
+++ b/INSTALL
@@ -23,7 +23,7 @@ site-packages directory on your system.
For advanced options, please refer to the easy_install and/or the distutils
documentation:
- http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://setuptools.readthedocs.io/en/latest/easy_install.html
http://docs.python.org/inst/inst.html
To use without installation, extract the archive into ``trytond/modules`` with
diff --git a/PKG-INFO b/PKG-INFO
index 0f626ba..6a6719b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_google_maps
-Version: 4.0.2
+Version: 4.2.0
Summary: Tryton module to link addresses to Google Maps
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.0/
+Download-URL: http://downloads.tryton.org/4.2/
Description: trytond_google_maps
===================
@@ -63,6 +63,7 @@ Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
diff --git a/address.py b/address.py
index a571782..131b486 100644
--- a/address.py
+++ b/address.py
@@ -17,27 +17,12 @@ class Address:
google_maps_url = fields.Function(fields.Char('Google Maps'),
'on_change_with_google_maps_url')
- @fields.depends('street', 'streetbis', 'zip', 'city', 'country',
- 'subdivision')
+ @fields.depends('name', 'street', 'zip', 'city', 'country', 'subdivision')
def on_change_with_google_maps_url(self, name=None):
lang = Transaction().language[:2]
- url = ''
- for value in (
- self.street,
- self.streetbis,
- self.zip,
- self.city,
- self.country.name if self.country else None,
- self.subdivision.name if self.subdivision else None,
- ):
- if value:
- if isinstance(value, str) and sys.version_info < (3,):
- url += ' ' + value.decode('utf-8')
- else:
- url += ' ' + value
- url = url.strip()
- if url:
- if sys.version_info < (3,):
+ url = ' '.join(self.get_full_address('full_address').splitlines())
+ if url.strip():
+ if isinstance(url, str) and sys.version_info < (3,):
url = url.encode('utf-8')
return 'http://maps.google.com/maps?hl=%s&q=%s' % \
(lang, urllib.quote(url))
diff --git a/locale/bg_BG.po b/locale/bg.po
similarity index 100%
rename from locale/bg_BG.po
rename to locale/bg.po
diff --git a/locale/ca_ES.po b/locale/ca.po
similarity index 100%
rename from locale/ca_ES.po
rename to locale/ca.po
diff --git a/locale/cs_CZ.po b/locale/cs.po
similarity index 100%
rename from locale/cs_CZ.po
rename to locale/cs.po
diff --git a/locale/de_DE.po b/locale/de.po
similarity index 100%
rename from locale/de_DE.po
rename to locale/de.po
diff --git a/locale/es_AR.po b/locale/es.po
similarity index 100%
rename from locale/es_AR.po
rename to locale/es.po
diff --git a/locale/es_EC.po b/locale/es_419.po
similarity index 100%
copy from locale/es_EC.po
copy to locale/es_419.po
diff --git a/locale/es_CO.po b/locale/es_CO.po
deleted file mode 100644
index 0d376f9..0000000
--- a/locale/es_CO.po
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:party.address,google_maps_url:"
-msgid "Google Maps"
-msgstr "Mapas de Google"
diff --git a/locale/es_ES.po b/locale/es_ES.po
deleted file mode 100644
index 0d376f9..0000000
--- a/locale/es_ES.po
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:party.address,google_maps_url:"
-msgid "Google Maps"
-msgstr "Mapas de Google"
diff --git a/locale/es_MX.po b/locale/es_MX.po
deleted file mode 100644
index 0d376f9..0000000
--- a/locale/es_MX.po
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:party.address,google_maps_url:"
-msgid "Google Maps"
-msgstr "Mapas de Google"
diff --git a/locale/fr_FR.po b/locale/fr.po
similarity index 100%
rename from locale/fr_FR.po
rename to locale/fr.po
diff --git a/locale/it_IT.po b/locale/it_IT.po
index b68e518..e08a92b 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -4,4 +4,4 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:party.address,google_maps_url:"
msgid "Google Maps"
-msgstr ""
+msgstr "Mappe di Google"
diff --git a/locale/lo_LA.po b/locale/lo.po
similarity index 100%
rename from locale/lo_LA.po
rename to locale/lo.po
diff --git a/locale/lt_LT.po b/locale/lt.po
similarity index 100%
rename from locale/lt_LT.po
rename to locale/lt.po
diff --git a/locale/nl_NL.po b/locale/nl.po
similarity index 100%
rename from locale/nl_NL.po
rename to locale/nl.po
diff --git a/locale/es_EC.po b/locale/pl.po
similarity index 86%
rename from locale/es_EC.po
rename to locale/pl.po
index d6602c8..2bf6d85 100644
--- a/locale/es_EC.po
+++ b/locale/pl.po
@@ -4,4 +4,4 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:party.address,google_maps_url:"
msgid "Google Maps"
-msgstr "Google Maps"
+msgstr "Mapy Google"
diff --git a/locale/ru_RU.po b/locale/ru.po
similarity index 100%
rename from locale/ru_RU.po
rename to locale/ru.po
diff --git a/locale/sl_SI.po b/locale/sl.po
similarity index 100%
rename from locale/sl_SI.po
rename to locale/sl.po
diff --git a/setup.py b/setup.py
index 8386e1e..b6ff7c9 100644
--- a/setup.py
+++ b/setup.py
@@ -90,6 +90,7 @@ setup(name=name,
'Natural Language :: German',
'Natural Language :: Hungarian',
'Natural Language :: Italian',
+ 'Natural Language :: Polish',
'Natural Language :: Portuguese (Brazilian)',
'Natural Language :: Russian',
'Natural Language :: Slovenian',
diff --git a/tests/test_google_maps.py b/tests/test_google_maps.py
index dba7b81..9d9cbc3 100644
--- a/tests/test_google_maps.py
+++ b/tests/test_google_maps.py
@@ -15,10 +15,15 @@ class GoogleMapsTestCase(ModuleTestCase):
"Test Google Maps URL"
pool = Pool()
Address = pool.get('party.address')
+ Party = pool.get('party.party')
+ party = Party()
+ party.save()
address = Address()
+ address.party = party
address.street = "300 Cliff Street"
address.zip = "18503"
address.city = "Scranton"
+ address.save()
self.assertEqual(
address.on_change_with_google_maps_url(),
diff --git a/tryton.cfg b/tryton.cfg
index 9d517e8..a2afc07 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.2
+version=4.2.0
depends:
ir
party
diff --git a/trytond_google_maps.egg-info/PKG-INFO b/trytond_google_maps.egg-info/PKG-INFO
index 255394e..fae5902 100644
--- a/trytond_google_maps.egg-info/PKG-INFO
+++ b/trytond_google_maps.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-google-maps
-Version: 4.0.2
+Version: 4.2.0
Summary: Tryton module to link addresses to Google Maps
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.0/
+Download-URL: http://downloads.tryton.org/4.2/
Description: trytond_google_maps
===================
@@ -63,6 +63,7 @@ Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
diff --git a/trytond_google_maps.egg-info/SOURCES.txt b/trytond_google_maps.egg-info/SOURCES.txt
index b57ef80..46d7d25 100644
--- a/trytond_google_maps.egg-info/SOURCES.txt
+++ b/trytond_google_maps.egg-info/SOURCES.txt
@@ -11,49 +11,45 @@ tryton.cfg
./address.py
./address.xml
./tryton.cfg
-./locale/bg_BG.po
-./locale/ca_ES.po
-./locale/cs_CZ.po
-./locale/de_DE.po
-./locale/es_AR.po
-./locale/es_CO.po
-./locale/es_EC.po
-./locale/es_ES.po
-./locale/es_MX.po
-./locale/fr_FR.po
+./locale/bg.po
+./locale/ca.po
+./locale/cs.po
+./locale/de.po
+./locale/es.po
+./locale/es_419.po
+./locale/fr.po
./locale/hu_HU.po
./locale/it_IT.po
./locale/ja_JP.po
-./locale/lo_LA.po
-./locale/lt_LT.po
-./locale/nl_NL.po
+./locale/lo.po
+./locale/lt.po
+./locale/nl.po
+./locale/pl.po
./locale/pt_BR.po
-./locale/ru_RU.po
-./locale/sl_SI.po
+./locale/ru.po
+./locale/sl.po
./locale/zh_CN.po
./tests/__init__.py
./tests/test_google_maps.py
./view/address_form.xml
doc/index.rst
-locale/bg_BG.po
-locale/ca_ES.po
-locale/cs_CZ.po
-locale/de_DE.po
-locale/es_AR.po
-locale/es_CO.po
-locale/es_EC.po
-locale/es_ES.po
-locale/es_MX.po
-locale/fr_FR.po
+locale/bg.po
+locale/ca.po
+locale/cs.po
+locale/de.po
+locale/es.po
+locale/es_419.po
+locale/fr.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
-locale/lo_LA.po
-locale/lt_LT.po
-locale/nl_NL.po
+locale/lo.po
+locale/lt.po
+locale/nl.po
+locale/pl.po
locale/pt_BR.po
-locale/ru_RU.po
-locale/sl_SI.po
+locale/ru.po
+locale/sl.po
locale/zh_CN.po
trytond_google_maps.egg-info/PKG-INFO
trytond_google_maps.egg-info/SOURCES.txt
diff --git a/trytond_google_maps.egg-info/requires.txt b/trytond_google_maps.egg-info/requires.txt
index 095799c..40629bf 100644
--- a/trytond_google_maps.egg-info/requires.txt
+++ b/trytond_google_maps.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_party >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
+trytond_party >= 4.2, < 4.3
+trytond >= 4.2, < 4.3
--
tryton-modules-google-maps
More information about the tryton-debian-vcs
mailing list