From a8c7f4e2fa79545b2a72d9be0023674200b40027 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 22 Feb 2013 09:42:46 +0100 Subject: [PATCH] [IMP] survey: translate field bzr revid: chm@openerp.com-20130222084246-cw346s1nnjkyvco3 --- addons/survey/survey.py | 32 ++++++++++++------------- addons/survey/wizard/survey_answer.py | 34 +++++++++++++-------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/addons/survey/survey.py b/addons/survey/survey.py index cfa1cb8c46a..2a065e146d2 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -85,7 +85,7 @@ class survey(osv.osv): return res _columns = { - 'title': fields.char('Survey Title', size=128, required=1), + 'title': fields.char('Survey Title', size=128, required=1, translate=True), 'page_ids': fields.one2many('survey.page', 'survey_id', 'Page'), 'date_open': fields.datetime('Survey Open Date', readonly=1), 'date_close': fields.datetime('Survey Close Date', readonly=1), @@ -95,7 +95,7 @@ class survey(osv.osv): 'sign_in': fields.boolean('User must be sign up'), 'tot_start_survey': fields.function(_get_tot_start_survey, string="Total Started Survey", type="integer"), 'tot_comp_survey': fields.function(_get_tot_comp_survey, string="Total Completed Survey", type="integer"), - 'note': fields.text('Description', size=128), + 'note': fields.text('Description', size=128, translate=True), 'type': fields.many2one('survey.type', 'Type'), 'color': fields.integer('Color Index'), 'response_ids': fields.one2many('survey.response', 'survey_id', 'Responses', readonly=1), @@ -255,11 +255,11 @@ class survey_page(osv.osv): _rec_name = 'title' _order = 'sequence' _columns = { - 'title': fields.char('Page Title', size=128, required=1), + 'title': fields.char('Page Title', size=128, required=1, translate=True), 'survey_id': fields.many2one('survey', 'Survey', ondelete='cascade'), 'question_ids': fields.one2many('survey.question', 'page_id', 'Questions'), 'sequence': fields.integer('Page Nr'), - 'note': fields.text('Description'), + 'note': fields.text('Description', translate=True), } _defaults = { 'sequence': 1 @@ -320,19 +320,19 @@ class survey_question(osv.osv): _columns = { 'page_id': fields.many2one('survey.page', 'Survey Page', ondelete='cascade', required=1), - 'question': fields.char('Question', size=128, required=1), + 'question': fields.char('Question', required=1, translate=True), 'answer_choice_ids': fields.one2many('survey.answer', 'question_id', 'Answer'), 'is_require_answer': fields.boolean('Require Answer to Question'), 'required_type': fields.selection([('all', 'All'), ('at least', 'At Least'), ('at most', 'At Most'), ('exactly', 'Exactly'), ('a range', 'A Range')], 'Respondent must answer'), 'req_ans': fields.integer('#Required Answer'), 'maximum_req_ans': fields.integer('Maximum Required Answer'), 'minimum_req_ans': fields.integer('Minimum Required Answer'), - 'req_error_msg': fields.text('Error Message'), + 'req_error_msg': fields.text('Error Message', translate=True), 'allow_comment': fields.boolean('Allow Comment Field'), 'sequence': fields.integer('Sequence'), 'tot_resp': fields.function(_calc_response, string="Total Answer"), 'survey': fields.related('page_id', 'survey_id', type='many2one', relation='survey', string='Survey'), - 'descriptive_text': fields.text('Descriptive Text', size=255), + 'descriptive_text': fields.text('Descriptive Text', size=255, translate=True), 'column_heading_ids': fields.one2many('survey.question.column.heading', 'question_id', ' Column heading'), 'type': fields.selection([('multiple_choice_only_one_ans', 'Multiple Choice (Only One Answer)'), ('multiple_choice_multiple_ans', 'Multiple Choice (Multiple Answer)'), @@ -347,7 +347,7 @@ class survey_question(osv.osv): ('table', 'Table'), ], 'Question Type', required=1, ), 'is_comment_require': fields.boolean('Add Comment Field'), - 'comment_label': fields.char('Field Label', size=255), + 'comment_label': fields.char('Field Label', size=255, translate=True), 'comment_field_type': fields.selection([('char', 'Single Line Of Text'), ('text', 'Paragraph of Text')], 'Comment Field Type'), 'comment_valid_type': fields.selection([('do_not_validate', '''Don't Validate Comment Text.'''), ('must_be_specific_length', 'Must Be Specific Length'), @@ -362,9 +362,9 @@ class survey_question(osv.osv): 'comment_maximum_float': fields.float('Maximum decimal number'), 'comment_minimum_date': fields.date('Minimum date'), 'comment_maximum_date': fields.date('Maximum date'), - 'comment_valid_err_msg': fields.text('Error message'), + 'comment_valid_err_msg': fields.text('Error message', translate=True), 'make_comment_field': fields.boolean('Make Comment Field an Answer Choice'), - 'make_comment_field_err_msg': fields.text('Error message'), + 'make_comment_field_err_msg': fields.text('Error message', translate=True), 'is_validation_require': fields.boolean('Validate Text'), 'validation_type': fields.selection([('do_not_validate', '''Don't Validate Comment Text.'''), \ ('must_be_specific_length', 'Must Be Specific Length'), \ @@ -379,15 +379,15 @@ class survey_question(osv.osv): 'validation_maximum_float': fields.float('Maximum decimal number'), 'validation_minimum_date': fields.date('Minimum date'), 'validation_maximum_date': fields.date('Maximum date'), - 'validation_valid_err_msg': fields.text('Error message'), + 'validation_valid_err_msg': fields.text('Error message', translate=True), 'numeric_required_sum': fields.integer('Sum of all choices'), - 'numeric_required_sum_err_msg': fields.text('Error message'), + 'numeric_required_sum_err_msg': fields.text('Error message', translate=True), 'rating_allow_one_column_require': fields.boolean('Allow Only One Answer per Column (Forced Ranking)'), 'in_visible_rating_weight': fields.boolean('Is Rating Scale Invisible?'), 'in_visible_menu_choice': fields.boolean('Is Menu Choice Invisible?'), 'in_visible_answer_type': fields.boolean('Is Answer Type Invisible?'), 'comment_column': fields.boolean('Add comment column in matrix'), - 'column_name': fields.char('Column Name', size=256), + 'column_name': fields.char('Column Name', size=256, translate=True), 'no_of_rows': fields.integer('No of Rows'), } _defaults = { @@ -564,7 +564,7 @@ class survey_question_column_heading(osv.osv): return False _columns = { - 'title': fields.char('Column Heading', size=128, required=1), + 'title': fields.char('Column Heading', size=128, required=1, translate=True), 'menu_choice': fields.text('Menu Choice'), 'rating_weight': fields.integer('Weight'), 'question_id': fields.many2one('survey.question', 'Question', ondelete='cascade'), @@ -611,14 +611,14 @@ class survey_answer(osv.osv): _columns = { 'question_id': fields.many2one('survey.question', 'Question', ondelete='cascade'), - 'answer': fields.char('Answer', size=128, required=1), + 'answer': fields.char('Answer', size=128, required=1, translate=True), 'sequence': fields.integer('Sequence'), 'response': fields.function(_calc_response_avg, string="#Answer", multi='sums'), 'average': fields.function(_calc_response_avg, string="#Avg", multi='sums'), 'type': fields.selection([('char', 'Character'), ('date', 'Date'), ('datetime', 'Date & Time'), \ ('integer', 'Integer'), ('float', 'Float'), ('selection', 'Selection'), \ ('email', 'Email')], "Type of Answer", required=1), - 'menu_choice': fields.text('Menu Choices'), + 'menu_choice': fields.text('Menu Choices', translate=True), 'in_visible_answer_type': fields.boolean('Is Answer Type Invisible??') } _defaults = { diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py index cb0ef320e2f..6b246b0ff37 100644 --- a/addons/survey/wizard/survey_answer.py +++ b/addons/survey/wizard/survey_answer.py @@ -62,7 +62,7 @@ class survey_question_wiz(osv.osv_memory): etree.SubElement(xml_group, 'separator', {'string': tools.ustr(col.title), 'colspan': '1'}) for row in que_rec.answer_choice_ids: etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(row.answer)) + ': -', 'align': '0.0'}) - for col in que_col_head.browse(cr, uid, [head.id for head in que_rec.column_heading_ids]): + for col in que_col_head.browse(cr, uid, [head.id for head in que_rec.column_heading_ids], context=context): etree.SubElement(xml_group, 'field', {'readonly': str(readonly), 'name': tools.ustr(que.id) + "_" + tools.ustr(row.id) + "_" + tools.ustr(col.id), 'nolabel': "1"}) fields[tools.ustr(que.id) + "_" + tools.ustr(row.id) + "_" + tools.ustr(col.id)] = {'type': 'boolean', 'string': col.title} @@ -488,7 +488,7 @@ class survey_question_wiz(osv.osv_memory): for field in fields_list: if field.split('_')[0] == 'progress': - tot_page_id = self.pool.get('survey').browse(cr, uid, context.get('survey_id', False)) + tot_page_id = self.pool.get('survey').browse(cr, uid, context.get('survey_id', False), context=context) tot_per = (float(100) * (int(field.split('_')[2]) + 1) / len(tot_page_id.page_ids)) value[field] = tot_per @@ -498,9 +498,9 @@ class survey_question_wiz(osv.osv_memory): response_ans = False sur_response_obj = self.pool.get('survey.response') if not context.get('edit') and check_token.get('response_id'): - response_ans = sur_response_obj.browse(cr, uid, check_token['response_id']) + response_ans = sur_response_obj.browse(cr, uid, check_token['response_id'], context=context) elif context.get('response_id') and int(context['response_id'][0]) > 0: - response_ans = sur_response_obj.browse(cr, uid, context['response_id'][context['response_no']]) + response_ans = sur_response_obj.browse(cr, uid, context['response_id'][context['response_no']], context=context) if response_ans: fields_list.sort() @@ -551,7 +551,7 @@ class survey_question_wiz(osv.osv_memory): return value surv_name_wiz = self.pool.get('survey.name.wiz') - sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id', False)) + sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id', False), context=context) for key, val in safe_eval(sur_name_read.get('store_ans', "{}")).items(): for field in fields_list: @@ -604,7 +604,7 @@ class survey_question_wiz(osv.osv_memory): #click first time on next button then increment on total start suvey if not safe_eval(sur_name_read['store_ans']): survey_id = sur_name_read['survey_id'][0] - survey_browse = survey_obj.read(cr, uid, survey_id) + survey_browse = survey_obj.read(cr, uid, survey_id, context=context) survey_obj.write(cr, uid, survey_id, {'tot_start_survey': survey_browse['tot_start_survey'] + 1}) if context.get('cur_id'): self.pool.get(context.get('object', False)).write(cr, uid, [int(context.get('cur_id', False))], {'response': response_id}) @@ -627,7 +627,7 @@ class survey_question_wiz(osv.osv_memory): que_id = key.split('_')[0] if que_id not in que_li: que_li.append(que_id) - que_rec = que_obj.read(cr, uid, [int(que_id)], [])[0] + que_rec = que_obj.read(cr, uid, [int(que_id)], context=context)[0] res_data = { 'question_id': que_id, 'date_create': datetime.now(), @@ -832,9 +832,9 @@ class survey_question_wiz(osv.osv_memory): else: resp_id_list = [] for update in click_update: - que_rec = que_obj.read(cr, uid, [int(sur_name_read['store_ans'][update]['question_id'])], [])[0] - res_ans_obj.unlink(cr, uid, res_ans_obj.search(cr, uid, [('response_id', '=', update)])) - surv_tbl_column_obj.unlink(cr, uid, surv_tbl_column_obj.search(cr, uid, [('response_table_id', '=', update)])) + que_rec = que_obj.read(cr, uid, [int(sur_name_read['store_ans'][update]['question_id'])], context=context)[0] + res_ans_obj.unlink(cr, uid, res_ans_obj.search(cr, uid, [('response_id', '=', update)], context=context)) + surv_tbl_column_obj.unlink(cr, uid, surv_tbl_column_obj.search(cr, uid, [('response_table_id', '=', update)], context=context)) resp_id_list.append(update) sur_name_read['store_ans'].update({update: {'question_id': sur_name_read['store_ans'][update]['question_id']}}) surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'store_ans': sur_name_read['store_ans']}) @@ -1025,7 +1025,7 @@ class survey_question_wiz(osv.osv_memory): if type(key) == type(True): context.pop(key) view_id = self.pool.get('ir.ui.view').search(cr, uid, [('model', '=', 'survey.question'), \ - ('name', '=', 'survey_question_wizard_test')]) + ('name', '=', 'survey_question_wizard_test')], context=context) return { 'view_type': 'form', "view_mode": 'form', @@ -1046,7 +1046,7 @@ class survey_question_wiz(osv.osv_memory): if type(key) == type(True): context.pop(key) view_id = self.pool.get('ir.ui.view').search(cr, uid, [('model', '=', 'survey.page'), \ - ('name', '=', 'survey_page_wizard_test')]) + ('name', '=', 'survey_page_wizard_test')], context=context) return { 'view_type': 'form', "view_mode": 'form', @@ -1067,7 +1067,7 @@ class survey_question_wiz(osv.osv_memory): if type(key) == type(True): context.pop(key) view_id = self.pool.get('ir.ui.view').search(cr, uid, [('model', '=', 'survey.page'), \ - ('name', '=', 'survey_page_wizard_test')]) + ('name', '=', 'survey_page_wizard_test')], context=context) return { 'view_type': 'form', "view_mode": 'form', @@ -1095,7 +1095,7 @@ class survey_question_wiz(osv.osv_memory): return {'type': 'ir.actions.act_window_close'} search_id = self.pool.get('ir.ui.view').search(cr, uid, [('model', '=', 'survey.question.wiz'), \ - ('name', '=', 'Survey Search')]) + ('name', '=', 'Survey Search')], context=context) surv_name_wiz = self.pool.get('survey.name.wiz') surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], \ {'transfer': True, 'page_no': context.get('page_number', False)}) @@ -1119,7 +1119,7 @@ class survey_question_wiz(osv.osv_memory): if type(key) == type(True): context.pop(key) view_id = self.pool.get('ir.ui.view').search(cr, uid, [('model', '=', 'survey.question'), \ - ('name', '=', 'survey_question_wizard_test')]) + ('name', '=', 'survey_question_wizard_test')], context=context) return { 'view_type': 'form', "view_mode": 'form', @@ -1144,7 +1144,7 @@ class survey_question_wiz(osv.osv_memory): que_obj = self.pool.get('survey.question') que_obj.unlink(cr, uid, [context.get('question_id', False)]) search_id = self.pool.get('ir.ui.view').search(cr, uid, [('model', '=', 'survey.question.wiz'), \ - ('name', '=', 'Survey Search')]) + ('name', '=', 'Survey Search')], context=context) surv_name_wiz = self.pool.get('survey.name.wiz') surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], \ {'transfer': True, 'page_no': context.get('page_number', 0)}) @@ -1164,7 +1164,7 @@ class survey_question_wiz(osv.osv_memory): if context is None: context = {} search_obj = self.pool.get('ir.ui.view') - search_id = search_obj.search(cr, uid, [('model', '=', 'survey.question.wiz'), ('name', '=', 'Survey Search')]) + search_id = search_obj.search(cr, uid, [('model', '=', 'survey.question.wiz'), ('name', '=', 'Survey Search')], context=context) surv_name_wiz = self.pool.get('survey.name.wiz') surv_name_wiz.write(cr, uid, [context.get('sur_name_id', False)], {'transfer': True, 'page': next and 'next' or 'previous'}) return {