diff options
| author | rlu-odoo <rlu@tinyerp.com> | 2014-07-09 17:09:38 +0530 |
|---|---|---|
| committer | Richard Mathot <rim@openerp.com> | 2014-07-18 13:45:41 +0200 |
| commit | 8b67a7202d9dd3492001cade3d361b8a5424ec3f (patch) | |
| tree | 5f21000fbb475fc309f343460f03f4feeec121e8 /addons/web/static/src | |
| parent | 1f5d135e44ee35f5aad18177052162d1672faccb (diff) | |
[REF] OpenERP --> Odoo in various UI texts
Rebranding has been done in:
- data/demo files
- html templates
- help notices
- comments
- logger messages
- and other various messages
(Commit taken from odoo-dev:8.0-improve-openerp-odoo-rlu at rev 7deaa08)
Closes #1260
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/chrome.js | 10 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index f5f8129d502..b035b220f28 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -252,7 +252,7 @@ instance.web.CrashManager = instance.web.Class.extend({ return; } if (error.data.name === "openerp.http.SessionExpiredException" || error.data.name === "werkzeug.exceptions.Forbidden") { - this.show_warning({type: "Session Expired", data: { message: _t("Your OpenERP session expired. Please refresh the current web page.") }}); + this.show_warning({type: "Session Expired", data: { message: _t("Your Odoo session expired. Please refresh the current web page.") }}); return; } if (error.data.exception_type === "except_osv" || error.data.exception_type === "warning" || error.data.exception_type === "access_error") { @@ -270,7 +270,7 @@ instance.web.CrashManager = instance.web.Class.extend({ } new instance.web.Dialog(this, { size: 'medium', - title: "OpenERP " + (_.str.capitalize(error.type) || "Warning"), + title: "Odoo " + (_.str.capitalize(error.type) || "Warning"), buttons: [ {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }} ], @@ -285,7 +285,7 @@ instance.web.CrashManager = instance.web.Class.extend({ this.parents('.modal').modal('hide'); }; new instance.web.Dialog(this, { - title: "OpenERP " + _.str.capitalize(error.type), + title: "Odoo " + _.str.capitalize(error.type), buttons: buttons }, QWeb.render('CrashManager.error', {session: instance.session, error: error})).open(); }, @@ -337,7 +337,7 @@ instance.web.RedirectWarningHandler = instance.web.Dialog.extend(instance.web.Ex new instance.web.Dialog(this, { size: 'medium', - title: "OpenERP " + (_.str.capitalize(error.type) || "Warning"), + title: "Odoo " + (_.str.capitalize(error.type) || "Warning"), buttons: [ {text: _t("Ok"), click: function() { self.$el.parents('.modal').modal('hide'); self.destroy();}}, {text: error.data.arguments[2], @@ -1190,7 +1190,7 @@ instance.web.WebClient = instance.web.Client.extend({ this._current_state = null; this.menu_dm = new instance.web.DropMisordered(); this.action_mutex = new $.Mutex(); - this.set('title_part', {"zopenerp": "OpenERP"}); + this.set('title_part', {"zopenerp": "Odoo"}); }, start: function() { var self = this; diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 2cce789480c..1b04e554431 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -85,7 +85,7 @@ </div> </div> <p class="oe_grey" style="margin: 10px"> - Fill in this form to create an OpenERP database. You can + Fill in this form to create an Odoo database. You can create databases for different companies or for different goals (testing, production). Once the database is created, you will be able to install your first application. @@ -112,7 +112,7 @@ <td class="oe_form_group_cell"> <span class="oe_form_field oe_form_field_boolean oe_grey" > <input type="checkbox" name="demo_data" /> - Check this box to evaluate OpenERP. + Check this box to evaluate Odoo. </span> </td> </tr> @@ -371,8 +371,8 @@ <h3>Version <t t-esc="version_info.server_version"/></h3> <div class="oe_bottom"> - <p>Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.<br /> - OpenERP is a trademark of the <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">OpenERP SA Company</a>.</p> + <p>Copyright © 2004-TODAY Odoo SA. All Rights Reserved.<br /> + Odoo is a trademark of the <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">OpenERP SA Company</a>.</p> <p>Licenced under the terms of <a target="_blank" href="http://www.gnu.org/licenses/agpl.html" style="text-decoration: underline;">GNU Affero General Public License</a></p> <p>For more information visit <a target="_blank" href="https://www.odoo.com" style="text-decoration: underline;">Odoo.com</a></p> </div> |
