Merge lp:~openerp-dev/openobject-addons/6.1-opw-580183-han into lp:openobject-addons/6.1

Proposed by Hardik Ansodariya (OpenERP)
Status: Approved
Approved by: Vinay Rana (OpenERP)
Approved revision: 7051
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-580183-han
Merge into: lp:openobject-addons/6.1
Diff against target: 73 lines (+27/-3)
4 files modified
portal/i18n/portal.pot (+12/-0)
portal/wizard/share_wizard.py (+2/-2)
share/i18n/share.pot (+12/-0)
share/wizard/share_wizard.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-580183-han
Reviewer Review Type Date Requested Status
Vinay Rana (OpenERP) (community) Approve
Naresh(OpenERP) Pending
Review via email: mp+133010@code.launchpad.net

Description of the change

Hello,

Fixed the issue translation in share module, "Share your Document" wizard, "Share Method" field.

with reference of maintenance case: 580183

To post a comment you must log in.
Revision history for this message
Vinay Rana (OpenERP) (vra-openerp) wrote :

The propose patch will fixes the issue.

review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-580183-port-mma/+merge/133436 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

7051. By Hardik Ansodariya (OpenERP)

[FIX] share: fixed the translation issue of share document wizard(Maintanence case: 580183)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'portal/i18n/portal.pot'
2--- portal/i18n/portal.pot 2012-02-08 01:08:30 +0000
3+++ portal/i18n/portal.pot 2012-11-06 05:46:22 +0000
4@@ -33,6 +33,18 @@
5 msgstr ""
6
7 #. module: portal
8+#: code:addons/portal/wizard/share_wizard.py:36
9+#, python-format
10+msgid "Users you already shared with"
11+msgstr ""
12+
13+#. module: portal
14+#: code:addons/portal/wizard/share_wizard.py:37
15+#, python-format
16+msgid "Existing Groups (e.g Portal Groups)"
17+msgstr ""
18+
19+#. module: portal
20 #: view:share.wizard:0
21 #: field:share.wizard,group_ids:0
22 msgid "Existing groups"
23
24=== modified file 'portal/wizard/share_wizard.py'
25--- portal/wizard/share_wizard.py 2011-12-19 16:54:40 +0000
26+++ portal/wizard/share_wizard.py 2012-11-06 05:46:22 +0000
27@@ -33,8 +33,8 @@
28
29 def _user_type_selection(self, cr, uid, context=None):
30 selection = super(share_wizard_portal, self)._user_type_selection(cr, uid, context=context)
31- selection.extend([('existing','Users you already shared with'),
32- ('groups','Existing Groups (e.g Portal Groups)')])
33+ selection.extend([('existing',_('Users you already shared with')),
34+ ('groups',_('Existing Groups (e.g Portal Groups)'))])
35 return selection
36
37 _columns = {
38
39=== modified file 'share/i18n/share.pot'
40--- share/i18n/share.pot 2012-02-08 01:08:30 +0000
41+++ share/i18n/share.pot 2012-11-06 05:46:22 +0000
42@@ -397,6 +397,18 @@
43 msgstr ""
44
45 #. module: share
46+#: code:addons/share/wizard/share_wizard.py:76
47+#, python-format
48+msgid "Direct link or embed code"
49+msgstr ""
50+
51+#. module: share
52+#: code:addons/share/wizard/share_wizard.py:76
53+#, python-format
54+msgid "Emails"
55+msgstr ""
56+
57+#. module: share
58 #: selection:share.wizard,access_mode:0
59 msgid "Can edit"
60 msgstr ""
61
62=== modified file 'share/wizard/share_wizard.py'
63--- share/wizard/share_wizard.py 2012-04-27 08:30:59 +0000
64+++ share/wizard/share_wizard.py 2012-11-06 05:46:22 +0000
65@@ -73,7 +73,7 @@
66
67 def _user_type_selection(self, cr, uid, context=None):
68 """Selection values may be easily overridden/extended via inheritance"""
69- return [('embedded', 'Direct link or embed code'), ('emails','Emails'), ]
70+ return [('embedded', _('Direct link or embed code')), ('emails',_('Emails')), ]
71
72 """Override of create() to auto-compute the action name"""
73 def create(self, cr, uid, values, context=None):