Merge lp:~openerp-dev/openobject-server/trunk-improve-translation into lp:openobject-server

[Vidhin Mehta (OpenERP)]

[lp:~openerp-dev/openobject-server/trunk-improve-translation]

5055. By Vidhin Mehta (OpenERP) on 2014-02-11

[MERGE]Trunk.

5056. By Chirag Dodiya(OpenERP) on 2014-02-12

[MRG]Merge with trunk

5057. By Vidhin Mehta (OpenERP) on 2014-02-14

[MERGE]Trunk

5058. By Vidhin Mehta (OpenERP) on 2014-02-18

[MERGE]Trunk.

5059. By Vidhin Mehta (OpenERP) on 2014-02-19

[MERGE]cod's branch with improvement

5060. By Vidhin Mehta (OpenERP) on 2014-02-19

[IMP]Change type.

5061. By Chirag Dodiya(OpenERP) on 2014-04-10

[MRG]Merged with lp:openobject-server

5062. By Chirag Dodiya(OpenERP) on 2014-04-10

[IMP]Improved warning message when deactive launguage and also improved typo for diactive button

5063. By Chirag Dodiya(OpenERP) on 2014-04-10

[IMP]Improved code when user try to diactive his preferred lang a warning message will popup

5064. By Chirag Dodiya(OpenERP) on 2014-04-10

[IMP]Improved warning message when user try to deactive language

5065. By Chirag Dodiya(OpenERP) on 2014-04-10

[IMP]Improved code as par coding convention and renamed method name for active deactive language.

5066. By Chirag Dodiya(OpenERP) on 2014-04-11

[MRG]Merged with lp:openobject-server

5067. By Chirag Dodiya(OpenERP) on 2014-05-02

[MRG]Merged with lp:openobject-server

Unmerged revisions

5067. By Chirag Dodiya(OpenERP) on 2014-05-02

[MRG]Merged with lp:openobject-server

5066. By Chirag Dodiya(OpenERP) on 2014-04-11

[MRG]Merged with lp:openobject-server

5065. By Chirag Dodiya(OpenERP) on 2014-04-10

[IMP]Improved code as par coding convention and renamed method name for active deactive language.

5064. By Chirag Dodiya(OpenERP) on 2014-04-10

[IMP]Improved warning message when user try to deactive language

5063. By Chirag Dodiya(OpenERP) on 2014-04-10

[IMP]Improved code when user try to diactive his preferred lang a warning message will popup

5062. By Chirag Dodiya(OpenERP) on 2014-04-10

[IMP]Improved warning message when deactive launguage and also improved typo for diactive button

5061. By Chirag Dodiya(OpenERP) on 2014-04-10

[MRG]Merged with lp:openobject-server

5060. By Vidhin Mehta (OpenERP) on 2014-02-19

[IMP]Change type.

5059. By Vidhin Mehta (OpenERP) on 2014-02-19

[MERGE]cod's branch with improvement

5058. By Vidhin Mehta (OpenERP) on 2014-02-18

[MERGE]Trunk.

=== modified file 'openerp/addons/base/module/wizard/base_language_install.py'
--- openerp/addons/base/module/wizard/base_language_install.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/module/wizard/base_language_install.py	2014-05-02 09:19:21 +0000
@@ -49,6 +49,7 @@
                 context = {'overwrite': True}
             modobj.update_translations(cr, uid, mids, lang, context or {})
             self.write(cr, uid, ids, {'state': 'done'}, context=context)
+            self.pool.get('res.users').write(cr, uid, uid, {'lang': lang})
         return {
             'name': _('Language Pack'),
             'view_type': 'form',
@@ -61,5 +62,10 @@
             'target': 'new',
             'res_id': ids and ids[0] or False,
         }
+    def reload_lang(self, cr, uid, ids, context=None):
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'reload',
+        }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'openerp/addons/base/module/wizard/base_language_install_view.xml'
--- openerp/addons/base/module/wizard/base_language_install_view.xml	2012-08-17 07:25:55 +0000
+++ openerp/addons/base/module/wizard/base_language_install_view.xml	2014-05-02 09:19:21 +0000
@@ -21,7 +21,7 @@
                         <button special="cancel" string="Cancel" class="oe_link"/>
                     </footer>
                     <footer states="done">
-                        <button special="cancel" string="Close"/>
+                        <button name="reload_lang" type="object" string="Close"/>
                     </footer>
                 </form>
            </field>

=== modified file 'openerp/addons/base/res/res_lang.py'
--- openerp/addons/base/res/res_lang.py	2013-12-03 21:19:03 +0000
+++ openerp/addons/base/res/res_lang.py	2014-05-02 09:19:21 +0000
@@ -79,7 +79,6 @@
         if not lang_name:
             lang_name = tools.ALL_LANGUAGES.get(lang, lang)
 
-
         def fix_xa0(s):
             """Fix badly-encoded non-breaking space Unicode character from locale.localeconv(),
                coercing to utf-8, as some platform seem to output localeconv() in their system
@@ -122,12 +121,25 @@
                     or (lang.date_format and pattern in lang.date_format):
                     return False
         return True
+        
+    def _check_active_lang(self, cr, uid, ids, context=None):
+        lang_ids = self.search(cr, uid, [('active', '=', True)])
+        if len(lang_ids) < 1:
+            return False
+        return True
 
     def _get_default_date_format(self, cursor, user, context=None):
         return '%m/%d/%Y'
 
     def _get_default_time_format(self, cursor, user, context=None):
         return '%H:%M:%S'
+        
+    def _no_of_user(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for lang in self.browse(cr, uid, ids, context=context):
+            user = len(self.pool.get('res.users').search(cr, uid, [('lang', '=', lang.code)]))
+            res[lang.id] = user
+        return res
 
     _columns = {
         'name': fields.char('Name', size=64, required=True),
@@ -141,6 +153,7 @@
         'grouping':fields.char('Separator Format',size=64,required=True,help="The Separator Format should be like [,n] where 0 < n :starting from Unit digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be 1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as 106,500. Provided ',' as the thousand separator in each case."),
         'decimal_point':fields.char('Decimal Separator', size=64,required=True),
         'thousands_sep':fields.char('Thousands Separator',size=64),
+        'no_of_user': fields.function(_no_of_user, string="Number of user",help='Number of user for this language.', type='integer'),
     }
     _defaults = {
         'active': 1,
@@ -158,7 +171,8 @@
     ]
 
     _constraints = [
-        (_check_format, 'Invalid date/time format directive specified. Please refer to the list of allowed directives, displayed when you edit a language.', ['time_format', 'date_format'])
+        (_check_format, 'Invalid date/time format directive specified. Please refer to the list of allowed directives, displayed when you edit a language.', ['time_format', 'date_format']),
+        (_check_active_lang, 'Atleast one language should be enabled.', ['active'])
     ]
 
     @tools.ormcache(skiparg=3)
@@ -173,11 +187,27 @@
         decimal_point = lang_obj.decimal_point
         grouping = lang_obj.grouping
         return grouping, thousands_sep, decimal_point
-
+        
+    def send_notification(self, cr, uid, ids, context=None):
+        user_obj = self.pool.get('res.users')
+        for rec in self.browse(cr, uid, ids, context=context):
+            user_ids = user_obj.search(cr, uid, [('lang', '=', rec['code'])])
+            email_from = user_obj.browse(cr, uid, uid, context=context)
+            for uids in user_ids:
+                user = user_obj.browse(cr, uid, uids, context=context)
+                subject = 'Language notification'
+                body = _('Dear %s,\n %s Langague is no more supported, edited by %s in database "%s".')% (user.name, rec['name'], email_from.name, cr.dbname)
+                tools.email_send(email_from.email, [user.email], subject, body)
+        return True
+        
     def write(self, cr, uid, ids, vals, context=None):
         for lang_id in ids :
             self._lang_data_get.clear_cache(self)
-        return super(lang, self).write(cr, uid, ids, vals, context)
+        return_value = super(lang, self).write(cr, uid, ids, vals, context)
+        lang_status = vals.get('active')
+        if not lang_status and isinstance(lang_status, bool):
+            self.send_notification(cr, uid, ids, context=context)
+        return return_value
 
     def unlink(self, cr, uid, ids, context=None):
         if context is None:
@@ -196,6 +226,22 @@
             trans_obj.unlink(cr, uid, trans_ids, context=context)
         return super(lang, self).unlink(cr, uid, ids, context=context)
 
+    def check_single_lang_enable(self, cr, uid, context=None):
+        ids = self.search(cr, uid, [('active','=',True)], context=context)
+        return True if len(ids) == 1 else False
+
+    def set_deactive(self, cr, uid, ids, context=None):
+        lang = self.read(cr, uid, ids, ['code'], context=context)[0]
+        user_lang = self.pool.get('res.users').read(cr, uid, uid, ['lang'], context=context)
+        if lang['code'] == user_lang['lang']:
+            raise osv.except_osv(_('Error!'), _("You cannot deactivate your preferred language. If you still want to deactivate, kindly change it from your user preferences."))
+        self.write(cr, uid, ids, { 'active': False}, context=context)
+        return True
+        
+    def set_active(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, { 'active': True}, context=context)
+        return True
+
     #
     # IDS: can be a list of IDS or a list of XML_IDS
     #

=== modified file 'openerp/addons/base/res/res_lang_view.xml'
--- openerp/addons/base/res/res_lang_view.xml	2012-08-07 12:51:38 +0000
+++ openerp/addons/base/res/res_lang_view.xml	2014-05-02 09:19:21 +0000
@@ -11,7 +11,10 @@
                     <field name="iso_code"/>
                     <field name="direction"/>
                     <field name="translatable"/>
-                    <field name="active"/>
+                    <field name="no_of_user"/>
+                    <field name="active" invisible="1"/>
+                    <button name="set_deactive" help="Active" attrs="{'invisible': [('active', '=', False)]}" type="object" icon="gtk-yes"/>
+                    <button name="set_active" help="Deactive" attrs="{'invisible': [('active', '=', True)]}" type="object" icon="gtk-no"/>
                     <button name="%(base.action_wizard_update_translations)d"
                     string="Update Terms" type="action" icon="gtk-ok" help="Update Languague Terms"/>
                 </tree>
@@ -38,6 +41,7 @@
                         <newline/>
                         <field name="active" />
                         <field name="translatable"/>
+                        <field name="no_of_user"/>
                     </group>
                     <separator colspan="4" string="Legends for Date and Time Formats"/>
                     <group col="4" colspan="4">

=== modified file 'openerp/addons/base/res/res_users.py'
--- openerp/addons/base/res/res_users.py	2014-05-01 15:26:04 +0000
+++ openerp/addons/base/res/res_users.py	2014-05-02 09:19:21 +0000
@@ -157,6 +157,10 @@
     def _get_password(self, cr, uid, ids, arg, karg, context=None):
         return dict.fromkeys(ids, '')
 
+    def _no_of_lang_enable(self, cr, uid, ids, arg, karg, context=None):
+        val = self.pool.get('res.lang').check_single_lang_enable(cr, uid, context=context)
+        return dict.fromkeys(ids, val)
+
     _columns = {
         'id': fields.integer('ID'),
         'login_date': fields.date('Latest connection', select=1),
@@ -185,6 +189,7 @@
         # backward compatibility fields
         'user_email': fields.related('email', type='char',
             deprecated='Use the email field instead of user_email. This field will be removed with OpenERP 7.1.'),
+        'translation_flag':fields.function(_no_of_lang_enable, type='boolean', string='One language Enable'),
     }
 
     def on_change_login(self, cr, uid, ids, login, context=None):
@@ -364,7 +369,7 @@
         for k in self._all_columns.keys():
             if k.startswith('context_'):
                 context_key = k[8:]
-            elif k in ['lang', 'tz']:
+            elif k in ['lang', 'tz','translation_flag']:
                 context_key = k
             else:
                 context_key = False

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2014-04-16 14:34:31 +0000
+++ openerp/osv/orm.py	2014-05-02 09:19:21 +0000
@@ -3886,6 +3886,8 @@
         updend = []
         direct = []
         totranslate = context.get('lang', False) and (context['lang'] != 'en_US')
+        single_lang_mode = self.pool.get('res.lang').check_single_lang_enable(cr, user, context=None)
+        
         for field in vals:
             field_column = self._all_columns.get(field) and self._all_columns.get(field).column
             if field_column and field_column.deprecated:
@@ -3921,15 +3923,22 @@
 
             if totranslate:
                 # TODO: optimize
+                ir_translation = self.pool.get('ir.translation')
+                model_name = self.pool[self._name]
+                context_wo_lang = dict(context, lang=None)
                 for f in direct:
+                    src_trans = model_name.read(cr, user, ids, [f])[0][f]
                     if self._columns[f].translate:
-                        src_trans = self.pool[self._name].read(cr, user, ids, [f])[0][f]
-                        if not src_trans:
-                            src_trans = vals[f]
-                            # Inserting value to DB
-                            context_wo_lang = dict(context, lang=None)
-                            self.write(cr, user, ids, {f: vals[f]}, context=context_wo_lang)
-                        self.pool.get('ir.translation')._set_ids(cr, user, self._name+','+f, 'model', context['lang'], ids, vals[f], src_trans)
+                        if single_lang_mode:
+                            if self.write(cr, user, ids, {f: vals[f]}, context_wo_lang):
+                                ids_to_unlink = ir_translation.search(cr, user, [('src', '=', src_trans or vals[f]), ('type', '=', 'model'),('name', '=', self._name+','+f),('res_id', 'in', ids)])
+                                ir_translation.unlink(cr, user, ids_to_unlink, context)
+                        else:
+                            if not src_trans:
+                                src_trans = vals[f]
+                                # Inserting value to DB
+                                self.write(cr, user, ids, {f: vals[f]}, context=context_wo_lang)
+                            ir_translation._set_ids(cr, user, self._name+','+f, 'model', context['lang'], ids, vals[f], src_trans)
 
 
         # call the 'set' method of fields which are not classic_write

=== modified file 'openerp/service/db.py'
--- openerp/service/db.py	2014-03-21 15:56:59 +0000
+++ openerp/service/db.py	2014-05-02 09:19:21 +0000
@@ -49,6 +49,10 @@
             values = {'password': user_password, 'lang': lang}
             registry['res.users'].write(cr, SUPERUSER_ID, [SUPERUSER_ID], values)
 
+            lang_obj = registry['res.lang']
+            lang_ids = lang_obj.search(cr, SUPERUSER_ID, [('code', '!=', lang)])
+            lang_obj.write(cr, SUPERUSER_ID, lang_ids, {'active': False})
+
             cr.execute('SELECT login, password FROM res_users ORDER BY login')
             self_actions[id].update(users=cr.dictfetchall(), clean=True)
             cr.commit()