Hardik Sanchawat (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-survey-hsa
into lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp-dbr.
Requested reviews:
Kuldeep Joshi(OpenERP) (kjo-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-survey-hsa/+merge/114859
Hello,
I update warning messages in survey module.
Thanks
-hsa
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-survey-hsa/+merge/114859
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp-dbr.
=== modified file 'survey/i18n/survey.pot'
--- survey/i18n/survey.pot 2012-06-25 13:42:53 +0000
+++ survey/i18n/survey.pot 2012-07-13 13:23:21 +0000
@@ -501,7 +501,7 @@
#. module: survey
#: code:addons/survey/survey.py:439
#, python-format
-msgid "You must enter one or more menu choices in column heading"
+msgid "You must enter one or more menu choices in column heading."
msgstr ""
#. module: survey
@@ -584,7 +584,7 @@
#. module: survey
#: code:addons/survey/wizard/survey_answer.py:126
#, python-format
-msgid "You can not answer this survey more than %s times"
+msgid "You cannot answer this survey more than %s times"
msgstr ""
#. module: survey
@@ -595,7 +595,7 @@
#. module: survey
#: code:addons/survey/wizard/survey_answer.py:119
#, python-format
-msgid "You can not answer because the survey is not open"
+msgid "You can not answer because the survey is not open."
msgstr ""
#. module: survey
@@ -632,7 +632,7 @@
#. module: survey
#: code:addons/survey/survey.py:479
#, python-format
-msgid "You must enter one or more menu choices in column heading (white spaces not allowed)"
+msgid "You must enter one or more menu choices in column heading (white spaces not allowed)."
msgstr ""
#. module: survey
@@ -643,7 +643,7 @@
#. module: survey
#: code:addons/survey/survey.py:477
#, python-format
-msgid "You must enter one or more menu choices in column heading"
+msgid "You must enter one or more menu choices in column heading."
msgstr ""
#. module: survey
@@ -690,7 +690,7 @@
#: code:addons/survey/wizard/survey_answer.py:745
#: code:addons/survey/wizard/survey_answer.py:940
#, python-format
-msgid "Please enter an integer value"
+msgid "Please enter an integer value."
msgstr ""
#. module: survey
@@ -815,7 +815,7 @@
#. module: survey
#: code:addons/survey/wizard/survey_selection.py:83
#, python-format
-msgid "You can not give more response. Please contact the author of this survey for further assistance."
+msgid "You cannot give more response. Please contact the author of this survey for further assistance."
msgstr ""
#. module: survey
@@ -910,7 +910,7 @@
#. module: survey
#: code:addons/survey/survey.py:472
#, python-format
-msgid "Maximum Required Answer is greater than Minimum Required Answer"
+msgid "Maximum Required Answer is greater than Minimum Required Answer."
msgstr ""
#. module: survey
@@ -1131,7 +1131,7 @@
#. module: survey
#: code:addons/survey/wizard/survey_selection.py:80
#, python-format
-msgid "You can not give response for this survey more than %s times"
+msgid "You cannot give response for this survey more than %s times"
msgstr ""
#. module: survey
@@ -1370,7 +1370,7 @@
#. module: survey
#: code:addons/survey/wizard/survey_answer.py:779
#, python-format
-msgid "You cannot select the same answer more than one time"
+msgid "You cannot select the same answer more than one time."
msgstr ""
#. module: survey
@@ -1487,7 +1487,7 @@
#. module: survey
#: code:addons/survey/wizard/survey_answer.py:971
#, python-format
-msgid "You cannot select same answer more than one time'"
+msgid "You cannot select same answer more than one time.'"
msgstr ""
#. module: survey
=== modified file 'survey/survey.py'
--- survey/survey.py 2012-07-10 11:07:40 +0000
+++ survey/survey.py 2012-07-13 13:23:21 +0000
@@ -449,11 +449,11 @@
for col in vals['column_heading_ids']:
if not col[2] or not col[2].has_key('menu_choice') or not col[2]['menu_choice']:
raise osv.except_osv(_('Warning !'),_("You must enter one or more menu choices\
- in column heading"))
+ in column heading."))
elif not col[2] or not col[2].has_key('menu_choice') or\
col[2]['menu_choice'].strip() == '':
raise osv.except_osv(_('Warning !'),_("You must enter one or more menu \
- choices in column heading (white spaces not allowed)"))
+ choices in column heading (white spaces not allowed)."))
return super(survey_question, self).write(cr, uid, ids, vals, context=context)
@@ -481,14 +481,14 @@
if vals.has_key('answer_choice_ids') or vals['maximum_req_ans'] > len(vals['answer_choice_ids']) or not vals['maximum_req_ans']:
raise osv.except_osv(_('Warning !'),_("Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d.") % (len(vals['answer_choice_ids'])+1))
if maximum_ans <= minimum_ans:
- raise osv.except_osv(_('Warning !'),_("Maximum Required Answer is greater than Minimum Required Answer"))
+ raise osv.except_osv(_('Warning !'),_("Maximum Required Answer is greater than Minimum Required Answer."))
if vals['type'] == 'matrix_of_drop_down_menus':
for col in vals['column_heading_ids']:
if not col[2] or not col[2].has_key('menu_choice') or not col[2]['menu_choice']:
- raise osv.except_osv(_('Warning !'),_("You must enter one or more menu choices in column heading"))
+ raise osv.except_osv(_('Warning !'),_("You must enter one or more menu choices in column heading."))
elif not col[2] or not col[2].has_key('menu_choice') or col[2]['menu_choice'].strip() == '':
- raise osv.except_osv(_('Warning !'),_("You must enter one or more menu choices in column heading (white spaces not allowed)"))
+ raise osv.except_osv(_('Warning !'),_("You must enter one or more menu choices in column heading (white spaces not allowed)."))
res = super(survey_question, self).create(cr, uid, vals, context)
return res
=== modified file 'survey/wizard/survey_answer.py'
--- survey/wizard/survey_answer.py 2012-06-25 13:42:53 +0000
+++ survey/wizard/survey_answer.py 2012-07-13 13:23:21 +0000
@@ -116,14 +116,14 @@
if ((context.has_key('active') and not context.get('active', False)) \
or not context.has_key('active')) and not sur_name_rec.page_no + 1:
if sur_rec.state != "open" :
- raise osv.except_osv(_('Warning !'),_("You can not answer because the survey is not open"))
+ raise osv.except_osv(_('Warning !'),_("You cannot answer because the survey is not open."))
cr.execute('select count(id) from survey_history where user_id=%s\
and survey_id=%s', (uid,survey_id))
res = cr.fetchone()[0]
user_limit = survey_obj.browse(cr, uid, survey_id)
user_limit = user_limit.response_user
if user_limit and res >= user_limit:
- raise osv.except_osv(_('Warning !'),_("You can not answer this survey more than %s times") % (user_limit))
+ raise osv.except_osv(_('Warning !'),_("You cannot answer this survey more than %s times") % (user_limit))
if sur_rec.max_response_limit and sur_rec.max_response_limit <= sur_rec.tot_start_survey and not sur_name_rec.page_no + 1:
survey_obj.write(cr, uid, survey_id, {'state':'close', 'date_close':strftime("%Y-%m-%d %H:%M:%S")})
@@ -743,7 +743,7 @@
except:
for res in resp_id_list:
sur_name_read['store_ans'].pop(res)
- raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + _("Please enter an integer value"))
+ raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' \n" + _("Please enter an integer value."))
elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) == 3:
if type(val1) == type('') or type(val1) == type(u''):
@@ -777,7 +777,7 @@
if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
for res in resp_id_list:
sur_name_read['store_ans'].pop(res)
- raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "'\n" + _("You cannot select the same answer more than one time"))
+ raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "'\n" + _("You cannot select the same answer more than one time."))
if not select_count:
resp_obj.write(cr, uid, resp_id, {'state':'skip'})
@@ -938,7 +938,7 @@
sur_name_read['store_ans'][update].update({key:val})
select_count += 1
except:
- raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "'\n" + _("Please enter an integer value"))
+ raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "'\n" + _("Please enter an integer value."))
elif val and len(key.split('_')) == 3:
resp_obj.write(cr, uid, update, {'state': 'done'})
@@ -969,7 +969,7 @@
raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' " + tools.ustr(que_rec['make_comment_field_err_msg']))
if que_rec['type'] == "rating_scale" and que_rec['rating_allow_one_column_require'] and len(selected_value) > len(list(set(selected_value))):
- raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "\n" + _("You cannot select same answer more than one time'"))
+ raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "\n" + _("You cannot select same answer more than one time.'"))
if que_rec['numeric_required_sum'] and numeric_sum > que_rec['numeric_required_sum']:
raise osv.except_osv(_('Warning !'), "'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg']))
=== modified file 'survey/wizard/survey_selection.py'
--- survey/wizard/survey_selection.py 2012-02-13 15:27:55 +0000
+++ survey/wizard/survey_selection.py 2012-07-13 13:23:21 +0000
@@ -77,10 +77,10 @@
res = cr.fetchone()[0]
sur_rec = survey_obj.browse(cr,uid,survey_id,context=context)
if sur_rec.response_user and res >= sur_rec.response_user:
- raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (sur_rec.response_user))
+ raise osv.except_osv(_('Warning !'),_("You cannot give response for this survey more than %s times") % (sur_rec.response_user))
if sur_rec.max_response_limit and sur_rec.max_response_limit <= sur_rec.tot_start_survey:
- raise osv.except_osv(_('Warning !'),_("You can not give more response. Please contact the author of this survey for further assistance."))
+ raise osv.except_osv(_('Warning !'),_("You cannot give more response. Please contact the author of this survey for further assistance."))
search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
return {
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
