Merge lp:~openerp-dev/openerp-web/7.0-opw-597778-fka into lp:openerp-web/7.0

Proposed by Foram Katharotiya (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/7.0-opw-597778-fka
Merge into: lp:openerp-web/7.0
Diff against target: 17 lines (+2/-2)
1 file modified
addons/web/static/src/xml/base.xml (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-opw-597778-fka
Reviewer Review Type Date Requested Status
Naresh(OpenERP) Pending
Vinay Rana (OpenERP) Pending
Review via email: mp+186474@code.launchpad.net

Description of the change

Hello,

I have improve the error message when timezone mismatch (in the yellow warning in the top right corner)

Your user's preference timezone does not match your browser timezone:
User's timezone
Europe/Brussels (+0200)
Browser's timezone
-0700

Independently from the values in this example, this message is incorrect because it mentions “browser’s timezone” while it should actually be “Operating System’s timezone”. There is no such thing as a browser’s timezone.

Thanks,
FKA

To post a comment you must log in.

Unmerged revisions

4032. By Foram Katharotiya (OpenERP)

[IMP] improve 'Browser timezone' string

4031. By Foram Katharotiya (OpenERP)

[IMP] improve the error message

4030. By Foram Katharotiya (OpenERP)

[IMP] improve the error message when the timezone mismatch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/xml/base.xml'
2--- addons/web/static/src/xml/base.xml 2013-08-29 12:44:48 +0000
3+++ addons/web/static/src/xml/base.xml 2013-09-19 07:29:21 +0000
4@@ -476,12 +476,12 @@
5 </t>
6 <t t-name="WebClient.timezone_notification">
7 <div class="oe_webclient_timezone_notification">
8- <p>Your user's preference timezone does not match your browser timezone:</p>
9+ <p>Your user's preference timezone does not match your operating system's timezone:</p>
10
11 <dl>
12 <dt>User's timezone</dt>
13 <dd><t t-esc="user_timezone"/> (<t t-esc="user_offset"/>)</dd>
14- <dt>Browser's timezone</dt>
15+ <dt>Operating system's timezone</dt>
16 <dd><t t-esc="browser_offset"/></dd>
17 </dl>
18