From 2c7dd89f989b2210712ccd6ff5d94f69a43d7092 Mon Sep 17 00:00:00 2001 From: Rui Manuel da Silva Martins Date: Mon, 25 May 2015 16:04:35 +0100 Subject: [PATCH] v0.1.1 --- README.md | 4 ++++ dist/wagtail-modeltranslation-0.1.1.tar.gz | Bin 0 -> 8689 bytes setup.py | 2 +- wagtail_modeltranslation.egg-info/PKG-INFO | 9 +++++++-- wagtail_modeltranslation/models.py | 3 ++- wagtail_modeltranslation/models.pyc | Bin 7807 -> 7849 bytes wagtail_modeltranslation/tests.py | 4 +--- 7 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 dist/wagtail-modeltranslation-0.1.1.tar.gz diff --git a/README.md b/README.md index 8203489..a5a427a 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,10 @@ Simple app containing a mixin model that integrates modeltranslation ## Release Notes +## v0.1.1 + +- Fixed url_path issue caused by a browser with language different from settings.LANGUAGE_CODE + ## v0.1 - Minor release working but lacks full test coverage. diff --git a/dist/wagtail-modeltranslation-0.1.1.tar.gz b/dist/wagtail-modeltranslation-0.1.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ff8ba09cac75cd742629f4a9abc3a751fdcab51b GIT binary patch literal 8689 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 literal 0 HcmV?d00001 diff --git a/setup.py b/setup.py index 9e7eb14..fc53f26 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir))) setup( name='wagtail-modeltranslation', - version='0.1', + version='0.1.1', packages=['wagtail_modeltranslation'], include_package_data=True, license='BSD License', diff --git a/wagtail_modeltranslation.egg-info/PKG-INFO b/wagtail_modeltranslation.egg-info/PKG-INFO index 37f5068..1467882 100644 --- a/wagtail_modeltranslation.egg-info/PKG-INFO +++ b/wagtail_modeltranslation.egg-info/PKG-INFO @@ -1,12 +1,13 @@ Metadata-Version: 1.1 Name: wagtail-modeltranslation -Version: 0.1 +Version: 0.1.1 Summary: Integration of django-modeltranslation with Wagtail CMS Home-page: https://github.com/infoportugal/wagtail-modeltranslation Author: Rui Martins Author-email: rmartins16@gmail.com License: BSD License Description: # Wagtail modeltranslation + (based on https://github.com/deschler/django-modeltranslation) Simple app containing a mixin model that integrates modeltranslation (https://github.com/deschler/django-modeltranslation) into wagtail panels system. @@ -55,9 +56,13 @@ Description: # Wagtail modeltranslation ## Release Notes + ## v0.1.1 + + - Fixed url_path issue caused by a browser with language different from settings.LANGUAGE_CODE + ## v0.1 - - Minor release working. Lacks of full test coverage. + - Minor release working but lacks full test coverage. - Last version had required fields validation problems, now fixed. ## v0.0.9 diff --git a/wagtail_modeltranslation/models.py b/wagtail_modeltranslation/models.py index 5331540..8adceec 100644 --- a/wagtail_modeltranslation/models.py +++ b/wagtail_modeltranslation/models.py @@ -238,7 +238,8 @@ class TranslationMixin(object): if not tr_slug: tr_slug = getattr(self, 'slug_'+settings.LANGUAGE_CODE) - setattr(self, 'url_path_'+lang[0], parent.url_path + tr_slug + '/') + parent_url_path = getattr(parent, 'url_path_'+lang[0]) + setattr(self, 'url_path_'+lang[0], parent_url_path + tr_slug + '/') else: # a page without a parent is the tree root, # which always has a url_path of '/' diff --git a/wagtail_modeltranslation/models.pyc b/wagtail_modeltranslation/models.pyc index 65a75dff16c34fbfb53ffe81ff046ea14768a806..8a01352e31b0dc6bbfdfe30f96e79d1d04155934 100644 GIT binary patch delta 193 zcmexwv(lE0`7