Merge lp:~therp-nl/magentoerpconnect/6.1-lp1179622-category_set_translate into lp:magentoerpconnect/oerp6.1-stable

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 687
Proposed branch: lp:~therp-nl/magentoerpconnect/6.1-lp1179622-category_set_translate
Merge into: lp:magentoerpconnect/oerp6.1-stable
Diff against target: 22 lines (+5/-5)
1 file modified
magentoerpconnect/product.py (+5/-5)
To merge this branch: bzr merge lp:~therp-nl/magentoerpconnect/6.1-lp1179622-category_set_translate
Reviewer Review Type Date Requested Status
MagentoERPConnect core editors Pending
Review via email: mp+163588@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'magentoerpconnect/product.py'
2--- magentoerpconnect/product.py 2013-01-25 10:50:53 +0000
3+++ magentoerpconnect/product.py 2013-05-13 18:23:26 +0000
4@@ -168,13 +168,13 @@
5 'level': fields.integer('Level', readonly=True),
6 'magento_parent_id': fields.integer('Magento Parent', readonly=True), #Key Changed from parent_id
7 'is_active': fields.boolean('Active?', help="Indicates whether active in magento"),
8- 'description': fields.text('Description'),
9+ 'description': fields.text('Description', translate=True),
10 'image': fields.binary('Image'),
11 'image_name':fields.char('File Name', size=100),
12- 'meta_title': fields.char('Title (Meta)', size=75),
13- 'meta_keywords': fields.text('Meta Keywords'),
14- 'meta_description': fields.text('Meta Description'),
15- 'url_key': fields.char('URL-key', size=100), #Readonly
16+ 'meta_title': fields.char('Title (Meta)', size=75, translate=True),
17+ 'meta_keywords': fields.text('Meta Keywords', translate=True),
18+ 'meta_description': fields.text('Meta Description', translate=True),
19+ 'url_key': fields.char('URL-key', size=100, translate=True), #Readonly
20 #==== Display Settings ====
21 'display_mode': fields.selection([
22 ('PRODUCTS', 'Products Only'),