[IMP] seperation of auth_signup's reset password and signup routes

bzr revid: fme@openerp.com-20140227154955-tnxyzw1ynuwlo5mj

44 files changed, 195 insertions, 980 deletions

diff --git a/addons/auth_oauth/__openerp__.py b/addons/auth_oauth/__openerp__.py
index 76f15687eb9..64068fa9b5e 100644
--- a/addons/auth_oauth/__openerp__.py
+++ b/addons/auth_oauth/__openerp__.py
@@ -31,7 +31,7 @@ Allow users to login through OAuth2 Provider.
     'author': 'OpenERP s.a.',
     'maintainer': 'OpenERP s.a.',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'web', 'base_setup'],
+    'depends': ['base', 'web', 'base_setup', 'auth_signup'],
     'data': [
         'res_users.xml',
         'auth_oauth_data.xml',
diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 5a22240abac..7db9479ad13 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -61,10 +61,14 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home):
         return providers
 
     def get_state(self, provider):
-        return dict(
+        state = dict(
             d=request.session.db,
             p=provider['id']
         )
+        token = request.params.get('token')
+        if token:
+            state['t'] = token
+        return state
 
     @http.route()
     def web_login(self, *args, **kw):
@@ -88,6 +92,24 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home):
 
         return response
 
+    @http.route()
+    def web_auth_signup(self, *args, **kw):
+        providers = self.list_providers()
+        if len(providers) == 1:
+            werkzeug.exceptions.abort(werkzeug.utils.redirect(providers[0]['auth_link'], 303))
+        response = super(OAuthLogin, self).web_auth_signup(*args, **kw)
+        response.qcontext.update(providers=providers)
+        return response
+
+    @http.route()
+    def web_auth_reset_password(self, *args, **kw):
+        providers = self.list_providers()
+        if len(providers) == 1:
+            werkzeug.exceptions.abort(werkzeug.utils.redirect(providers[0]['auth_link'], 303))
+        response = super(OAuthLogin, self).web_auth_reset_password(*args, **kw)
+        response.qcontext.update(providers=providers)
+        return response
+
 class OAuthController(http.Controller):
 
     @http.route('/auth_oauth/signin', type='http', auth='none')
diff --git a/addons/auth_oauth/views/auth_oauth_login.xml b/addons/auth_oauth/views/auth_oauth_login.xml
index f969d2f5eed..6c5deca924c 100644
--- a/addons/auth_oauth/views/auth_oauth_login.xml
+++ b/addons/auth_oauth/views/auth_oauth_login.xml
@@ -3,15 +3,35 @@
 -->
 <openerp>
     <data>
+        <template id="auth_oauth.providers" name="OAuth Providers">
+            <div t-foreach="providers" t-as="p">
+                <a t-att-href="p['auth_link']" class="btn btn-link">
+                    <i t-att-class="p['css_class']"/>
+                    <t t-esc="p['body']"/>
+                </a>
+            </div>
+        </template>
+
         <template id="auth_oauth.login" inherit_id="web.login" name="OAuth Login buttons">
             <xpath expr="//button[@type='submit']" position="before">
                 <div class="pull-right">
-                    <div t-foreach="providers" t-as="p">
-                        <a t-att-href="p['auth_link']" class="btn btn-link">
-                            <i t-att-class="p['css_class']"/>
-                            <t t-esc="p['body']"/>
-                        </a>
-                    </div>
+                    <t t-call="auth_oauth.providers"/>
+                </div>
+            </xpath>
+        </template>
+
+        <template id="auth_oauth.signup" inherit_id="auth_signup.signup" name="OAuth Signup buttons">
+            <xpath expr="//button[@type='submit']" position="before">
+                <div class="pull-right">
+                    <t t-call="auth_oauth.providers"/>
+                </div>
+            </xpath>
+        </template>
+
+        <template id="auth_oauth.reset_password" inherit_id="auth_signup.reset_password" name="OAuth Reset Password buttons">
+            <xpath expr="//button[@type='submit']" position="before">
+                <div class="pull-right">
+                    <t t-call="auth_oauth.providers"/>
                 </div>
             </xpath>
         </template>
diff --git a/addons/auth_oauth_signup/__init__.py b/addons/auth_oauth_signup/__init__.py
deleted file mode 100644
index 7c73af367bd..00000000000
--- a/addons/auth_oauth_signup/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2012-today OpenERP SA (<http://www.openerp.com>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>
-#
-##############################################################################
-
-import res_users
-import controllers
diff --git a/addons/auth_oauth_signup/__openerp__.py b/addons/auth_oauth_signup/__openerp__.py
deleted file mode 100644
index d3660f7c052..00000000000
--- a/addons/auth_oauth_signup/__openerp__.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-2014 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-{
-    'name': 'Signup with OAuth2 Authentication',
-    'version': '1.0',
-    'category': 'Hidden',
-    'description': """
-Allow users to sign up through OAuth2 Provider.
-===============================================
-""",
-    'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'depends': ['auth_oauth', 'auth_signup'],
-    'data': [
-        'views/auth_oauth_signup.xml',
-    ],
-    'js': [],
-    'css': [],
-    'qweb': [],
-    'installable': True,
-    'auto_install': True,
-}
diff --git a/addons/auth_oauth_signup/controllers/__init__.py b/addons/auth_oauth_signup/controllers/__init__.py
deleted file mode 100644
index e11f9ba81bb..00000000000
--- a/addons/auth_oauth_signup/controllers/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import main
-
-# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_oauth_signup/controllers/main.py b/addons/auth_oauth_signup/controllers/main.py
deleted file mode 100644
index 0b8ab22cdaa..00000000000
--- a/addons/auth_oauth_signup/controllers/main.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import openerp
-import werkzeug
-
-from openerp.http import request
-
-class OAuthSignupLogin(openerp.addons.web.controllers.main.Home):
-    def list_providers(self):
-        providers = super(OAuthSignupLogin, self).list_providers()
-        if len(providers) == 1 and request.params.get('mode') == 'signup':
-            werkzeug.exceptions.abort(werkzeug.utils.redirect(providers[0]['auth_link'], 303))
-        return providers
-
-    def get_state(self, provider):
-        state = super(OAuthSignupLogin, self).get_state(provider)
-        token = request.params.get('token')
-        if token:
-            state['t'] = token
-        return state
-
-# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_oauth_signup/i18n/ar.po b/addons/auth_oauth_signup/i18n/ar.po
deleted file mode 100644
index 9eeabd19d8b..00000000000
--- a/addons/auth_oauth_signup/i18n/ar.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-11-26 18:16+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "المستخدمين"
diff --git a/addons/auth_oauth_signup/i18n/auth_oauth_signup.pot b/addons/auth_oauth_signup/i18n/auth_oauth_signup.pot
deleted file mode 100644
index d4c0a829a7b..00000000000
--- a/addons/auth_oauth_signup/i18n/auth_oauth_signup.pot
+++ /dev/null
@@ -1,22 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* auth_oauth_signup
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-21 17:05+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr ""
-
diff --git a/addons/auth_oauth_signup/i18n/cs.po b/addons/auth_oauth_signup/i18n/cs.po
deleted file mode 100644
index bf6f59f24fa..00000000000
--- a/addons/auth_oauth_signup/i18n/cs.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Czech translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2014-02-03 16:54+0000\n"
-"Last-Translator: Jakub Drozd <Unknown>\n"
-"Language-Team: Czech <cs@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Uživatelé"
diff --git a/addons/auth_oauth_signup/i18n/da.po b/addons/auth_oauth_signup/i18n/da.po
deleted file mode 100644
index 75b7032c1de..00000000000
--- a/addons/auth_oauth_signup/i18n/da.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-09-15 20:08+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Bruger"
diff --git a/addons/auth_oauth_signup/i18n/de.po b/addons/auth_oauth_signup/i18n/de.po
deleted file mode 100644
index 57580243777..00000000000
--- a/addons/auth_oauth_signup/i18n/de.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-27 22:22+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Benutzer"
diff --git a/addons/auth_oauth_signup/i18n/en_GB.po b/addons/auth_oauth_signup/i18n/en_GB.po
deleted file mode 100644
index 699939d57b7..00000000000
--- a/addons/auth_oauth_signup/i18n/en_GB.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# English (United Kingdom) translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-02-06 14:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Users"
diff --git a/addons/auth_oauth_signup/i18n/es.po b/addons/auth_oauth_signup/i18n/es.po
deleted file mode 100644
index 072378eeaa7..00000000000
--- a/addons/auth_oauth_signup/i18n/es.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-27 11:38+0000\n"
-"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Usuarios"
diff --git a/addons/auth_oauth_signup/i18n/et.po b/addons/auth_oauth_signup/i18n/et.po
deleted file mode 100644
index 25c2888fea1..00000000000
--- a/addons/auth_oauth_signup/i18n/et.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Estonian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-10-09 14:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Estonian <et@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Kasutajad"
diff --git a/addons/auth_oauth_signup/i18n/fr.po b/addons/auth_oauth_signup/i18n/fr.po
deleted file mode 100644
index 02544f189c5..00000000000
--- a/addons/auth_oauth_signup/i18n/fr.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-29 16:08+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: French <fr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Utilisateurs"
diff --git a/addons/auth_oauth_signup/i18n/gl.po b/addons/auth_oauth_signup/i18n/gl.po
deleted file mode 100644
index 463caea11c3..00000000000
--- a/addons/auth_oauth_signup/i18n/gl.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2014-02-05 16:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Galician <gl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-06 05:33+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Usuarios"
diff --git a/addons/auth_oauth_signup/i18n/hr.po b/addons/auth_oauth_signup/i18n/hr.po
deleted file mode 100644
index c3cc0238ca0..00000000000
--- a/addons/auth_oauth_signup/i18n/hr.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-24 12:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Croatian <hr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Korisnici"
diff --git a/addons/auth_oauth_signup/i18n/hu.po b/addons/auth_oauth_signup/i18n/hu.po
deleted file mode 100644
index eaed110eeeb..00000000000
--- a/addons/auth_oauth_signup/i18n/hu.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Hungarian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-03-19 18:13+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hungarian <hu@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Felhasználók"
diff --git a/addons/auth_oauth_signup/i18n/it.po b/addons/auth_oauth_signup/i18n/it.po
deleted file mode 100644
index 4c01dc40d00..00000000000
--- a/addons/auth_oauth_signup/i18n/it.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-27 09:12+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Utenti"
diff --git a/addons/auth_oauth_signup/i18n/lt.po b/addons/auth_oauth_signup/i18n/lt.po
deleted file mode 100644
index 6cf0153f69f..00000000000
--- a/addons/auth_oauth_signup/i18n/lt.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Lithuanian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-04-24 18:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Lithuanian <lt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Naudotojai"
diff --git a/addons/auth_oauth_signup/i18n/mk.po b/addons/auth_oauth_signup/i18n/mk.po
deleted file mode 100644
index 3afed5fe7b3..00000000000
--- a/addons/auth_oauth_signup/i18n/mk.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Macedonian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-02-28 14:54+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Macedonian <mk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Корисници"
diff --git a/addons/auth_oauth_signup/i18n/mn.po b/addons/auth_oauth_signup/i18n/mn.po
deleted file mode 100644
index 8c45059310f..00000000000
--- a/addons/auth_oauth_signup/i18n/mn.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Mongolian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-02-06 07:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Mongolian <mn@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Хэрэглэгчид"
diff --git a/addons/auth_oauth_signup/i18n/nl.po b/addons/auth_oauth_signup/i18n/nl.po
deleted file mode 100644
index 5029138c5d9..00000000000
--- a/addons/auth_oauth_signup/i18n/nl.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-27 09:12+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch <nl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Gebruikers"
diff --git a/addons/auth_oauth_signup/i18n/nl_BE.po b/addons/auth_oauth_signup/i18n/nl_BE.po
deleted file mode 100644
index 2366d0844f2..00000000000
--- a/addons/auth_oauth_signup/i18n/nl_BE.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Dutch (Belgium) translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-04-15 16:01+0000\n"
-"Last-Translator: Els Van Vossel (Foxy) <Unknown>\n"
-"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Gebruikers"
diff --git a/addons/auth_oauth_signup/i18n/pl.po b/addons/auth_oauth_signup/i18n/pl.po
deleted file mode 100644
index c0e6153a430..00000000000
--- a/addons/auth_oauth_signup/i18n/pl.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Polish translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-11-14 12:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish <pl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Użytkownicy"
diff --git a/addons/auth_oauth_signup/i18n/pt.po b/addons/auth_oauth_signup/i18n/pt.po
deleted file mode 100644
index c0664b109b7..00000000000
--- a/addons/auth_oauth_signup/i18n/pt.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Portuguese translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-08 17:56+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Utilizadores"
diff --git a/addons/auth_oauth_signup/i18n/pt_BR.po b/addons/auth_oauth_signup/i18n/pt_BR.po
deleted file mode 100644
index 2d50e76837a..00000000000
--- a/addons/auth_oauth_signup/i18n/pt_BR.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-02 11:56+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Usuários"
diff --git a/addons/auth_oauth_signup/i18n/ro.po b/addons/auth_oauth_signup/i18n/ro.po
deleted file mode 100644
index 5d2593b66b4..00000000000
--- a/addons/auth_oauth_signup/i18n/ro.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-14 19:07+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Utilizatori"
diff --git a/addons/auth_oauth_signup/i18n/ru.po b/addons/auth_oauth_signup/i18n/ru.po
deleted file mode 100644
index e60c290f8e3..00000000000
--- a/addons/auth_oauth_signup/i18n/ru.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Russian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-02-13 09:46+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian <ru@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Пользователи"
diff --git a/addons/auth_oauth_signup/i18n/sl.po b/addons/auth_oauth_signup/i18n/sl.po
deleted file mode 100644
index a7acd1ceacc..00000000000
--- a/addons/auth_oauth_signup/i18n/sl.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Slovenian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-30 09:36+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovenian <sl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Uporabniki"
diff --git a/addons/auth_oauth_signup/i18n/sv.po b/addons/auth_oauth_signup/i18n/sv.po
deleted file mode 100644
index 93350614b98..00000000000
--- a/addons/auth_oauth_signup/i18n/sv.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Swedish translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-17 23:47+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Användare"
diff --git a/addons/auth_oauth_signup/i18n/tr.po b/addons/auth_oauth_signup/i18n/tr.po
deleted file mode 100644
index 4b61dc5a190..00000000000
--- a/addons/auth_oauth_signup/i18n/tr.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-02-03 12:07+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Kullanıcılar"
diff --git a/addons/auth_oauth_signup/i18n/vi.po b/addons/auth_oauth_signup/i18n/vi.po
deleted file mode 100644
index 086df785f57..00000000000
--- a/addons/auth_oauth_signup/i18n/vi.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Vietnamese translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-06-27 06:49+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese <vi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "Người dùng"
diff --git a/addons/auth_oauth_signup/i18n/zh_CN.po b/addons/auth_oauth_signup/i18n/zh_CN.po
deleted file mode 100644
index f3009f88142..00000000000
--- a/addons/auth_oauth_signup/i18n/zh_CN.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-02 10:59+0000\n"
-"Last-Translator: Oliver Yuan <Unknown>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "用户"
diff --git a/addons/auth_oauth_signup/i18n/zh_TW.po b/addons/auth_oauth_signup/i18n/zh_TW.po
deleted file mode 100644
index 0e3e0b23c3b..00000000000
--- a/addons/auth_oauth_signup/i18n/zh_TW.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Chinese (Traditional) translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-30 13:18+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:41+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
-
-#. module: auth_oauth_signup
-#: model:ir.model,name:auth_oauth_signup.model_res_users
-msgid "Users"
-msgstr "使用者"
diff --git a/addons/auth_oauth_signup/res_users.py b/addons/auth_oauth_signup/res_users.py
deleted file mode 100644
index a06968fa46f..00000000000
--- a/addons/auth_oauth_signup/res_users.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-2012 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import logging
-import simplejson
-
-import openerp
-from openerp.addons.auth_signup.res_users import SignupError
-from openerp.osv import osv, fields
-
-_logger = logging.getLogger(__name__)
-
-class res_users(osv.Model):
-    _inherit = 'res.users'
-
-    def _auth_oauth_signin(self, cr, uid, provider, validation, params, context=None):
-        # overridden to use signup method if regular oauth signin fails
-        try:
-            login = super(res_users, self)._auth_oauth_signin(cr, uid, provider, validation, params, context=context)
-
-        except openerp.exceptions.AccessDenied, access_denied_exception:
-            if context and context.get('no_user_creation'):
-                return None
-            state = simplejson.loads(params['state'])
-            token = state.get('t')
-            oauth_uid = validation['user_id']
-            email = validation.get('email', 'provider_%s_user_%s' % (provider, oauth_uid))
-            name = validation.get('name', email)
-            values = {
-                'name': name,
-                'login': email,
-                'email': email,
-                'oauth_provider_id': provider,
-                'oauth_uid': oauth_uid,
-                'oauth_access_token': params['access_token'],
-                'active': True,
-            }
-            try:
-                _, login, _ = self.signup(cr, uid, values, token, context=context)       
-            except SignupError:
-                raise access_denied_exception
-        return login
diff --git a/addons/auth_oauth_signup/views/auth_oauth_signup.xml b/addons/auth_oauth_signup/views/auth_oauth_signup.xml
deleted file mode 100644
index 139f36a4c0f..00000000000
--- a/addons/auth_oauth_signup/views/auth_oauth_signup.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- vim:et:si:ts=2:sts=2:sw=2 -->
-<openerp>
-  <data>
-    <template id="auth_oauth_signup.signup" inherit_id="auth_signup.signup" name="OAuth Signup buttons">
-      <xpath expr="//button[@type='submit']" position="before">
-        <div class="pull-right">
-          <div t-foreach="providers or []" t-as="p">
-            <a t-att-href="p['auth_link']" class="btn btn-link">
-              <i t-att-class="p['css_class']"/>
-              <t t-esc="p['body']"/>
-            </a>
-          </div>
-        </div>
-      </xpath>
-    </template>
-  </data>
-</openerp>
diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py
index 50402207018..2aaaf61d3dd 100644
--- a/addons/auth_signup/__openerp__.py
+++ b/addons/auth_signup/__openerp__.py
@@ -42,6 +42,6 @@ Allow users to sign up and reset their password
         'res_users_view.xml',
         'views/auth_signup_login.xml',
     ],
-    'js': ['static/src/js/auth_signup.js'],
+    'js': [],
     'bootstrap': True,
 }
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index f6c466b7123..54a13a0af87 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -19,83 +19,98 @@
 #
 ##############################################################################
 import logging
+import werkzeug
 
 import openerp
-import openerp.addons.web.controllers.main as webmain
 from openerp.addons.auth_signup.res_users import SignupError
 from openerp import http
 from openerp.http import request
 from openerp.tools.translate import _
-from openerp.tools import exception_to_unicode
 
 _logger = logging.getLogger(__name__)
 
-class AuthSignup(openerp.addons.web.controllers.main.Home):
+class AuthSignupHome(openerp.addons.web.controllers.main.Home):
 
     @http.route()
     def web_login(self, *args, **kw):
-        mode = request.params.get('mode')
+        response = super(AuthSignupHome, self).web_login(*args, **kw)
+        response.qcontext.update(self.get_auth_signup_config())
+        return response
+
+    @http.route('/web/signup', type='http', auth='public', website=True, multilang=True)
+    def web_auth_signup(self, *args, **kw):
+        qcontext = self.get_auth_signup_qcontext()
+
+        if not qcontext.get('token') and not qcontext.get('signup_enabled'):
+            raise werkzeug.exceptions.NotFound()
+
+        if 'error' not in qcontext and request.httprequest.method == 'POST':
+            try:
+                self.do_signup(qcontext)
+                return super(AuthSignupHome, self).web_login(*args, **kw)
+            except (SignupError, AssertionError), e:
+                qcontext['error'] = _(e.message)
+
+        return request.render('auth_signup.signup', qcontext)
+
+    @http.route('/web/reset_password', type='http', auth='public', website=True, multilang=True)
+    def web_auth_reset_password(self, *args, **kw):
+        qcontext = self.get_auth_signup_qcontext()
+
+        if not qcontext.get('token') and not qcontext.get('reset_password_enabled'):
+            raise werkzeug.exceptions.NotFound()
+
+        if 'error' not in qcontext and request.httprequest.method == 'POST':
+            try:
+                if qcontext.get('token'):
+                    self.do_signup(qcontext)
+                    return super(AuthSignupHome, self).web_login(*args, **kw)
+                else:
+                    login = qcontext.get('login')
+                    assert login, "No login provided."
+                    res_users = request.registry.get('res.users')
+                    res_users.reset_password(request.cr, openerp.SUPERUSER_ID, login)
+                    qcontext['message'] = _("An email has been sent with credentials to reset your password")
+            except SignupError:
+                qcontext['error'] = _("Could not reset your password")
+                _logger.exception('error when resetting password')
+            except Exception, e:
+                qcontext['error'] = _(e.message)
+
+
+        return request.render('auth_signup.reset_password', qcontext)
+
+    def get_auth_signup_config(self):
+        """retrieve the module config (which features are enabled) for the login page"""
+
+        icp = request.registry.get('ir.config_parameter')
+        return {
+            'signup_enabled': icp.get_param(request.cr, openerp.SUPERUSER_ID, 'auth_signup.allow_uninvited') == 'True',
+            'reset_password_enabled': icp.get_param(request.cr, openerp.SUPERUSER_ID, 'auth_signup.reset_password') == 'True',
+        }
+
+    def get_auth_signup_qcontext(self):
+        """ Shared helper returning the rendering context for signup and reset password """
         qcontext = request.params.copy()
-        super_response = None
-        if request.httprequest.method != 'POST' or mode not in ('reset', 'signup'):
-            # Default behavior is to try to login,  which in reset or signup mode in a non-sense.
-            super_response = super(AuthSignup, self).web_login(*args, **kw)
-        response = webmain.render_bootstrap_template('auth_signup.signup', qcontext)
-        if super_response.is_qweb:
-            response.qcontext.update(super_response.qcontext)
-        token = qcontext.get('token', None)
-        token_infos = None
-        if token:
+        qcontext.update(self.get_auth_signup_config())
+        if qcontext.get('token'):
             try:
                 # retrieve the user info (name, login or email) corresponding to a signup token
                 res_partner = request.registry.get('res.partner')
-                token_infos = res_partner.signup_retrieve_info(request.cr, openerp.SUPERUSER_ID, token)
+                token_infos = res_partner.signup_retrieve_info(request.cr, openerp.SUPERUSER_ID, qcontext.get('token'))
                 for k, v in token_infos.items():
                     qcontext.setdefault(k, v)
             except:
                 qcontext['error'] = _("Invalid signup token")
-                response.params['template'] = 'web.login'
-                return response
+        return qcontext
 
-        # retrieve the module config (which features are enabled) for the login page
-        icp = request.registry.get('ir.config_parameter')
-        config = {
-            'signup': icp.get_param(request.cr, openerp.SUPERUSER_ID, 'auth_signup.allow_uninvited') == 'True',
-            'reset': icp.get_param(request.cr, openerp.SUPERUSER_ID, 'auth_signup.reset_password') == 'True',
-        }
-        qcontext.update(config)
-
-        if 'error' in request.params or mode not in ('reset', 'signup') or (not token and not config[mode]):
-            if super_response.is_qweb:
-                super_response.qcontext.update(config)
-            return super_response
-
-        if request.httprequest.method == 'GET':
-            if token_infos:
-                qcontext.update(token_infos)
-        else:
-            res_users = request.registry.get('res.users')
-            login = request.params.get('login')
-            if mode == 'reset' and not token:
-                try:
-                    res_users.reset_password(request.cr, openerp.SUPERUSER_ID, login)
-                    qcontext['message'] = _("An email has been sent with credentials to reset your password")
-                    response.params['template'] = 'web.login'
-                except Exception, e:
-                    qcontext['error'] = exception_to_unicode(e) or _("Could not reset your password")
-                    _logger.exception('error when resetting password')
-            else:
-                values = dict((key, qcontext.get(key)) for key in ('login', 'name', 'password'))
-                try:
-                    self._signup_with_values(token, values)
-                    redirect = request.params.get('redirect')
-                    if not redirect:
-                        redirect = '/web?' + request.httprequest.query_string
-                    return http.redirect_with_hash(redirect)
-                except SignupError, e:
-                    qcontext['error'] = exception_to_unicode(e)
-
-        return response
+    def do_signup(self, qcontext):
+        """ Shared helper that creates a res.partner out of a token """
+        values = dict((key, qcontext.get(key)) for key in ('login', 'name', 'password'))
+        assert any([k for k in values.values()]), "The form was not properly filled in."
+        assert values.get('password') == qcontext.get('confirm_password'), "Passwords do not match; please retype them."
+        self._signup_with_values(qcontext.get('token'), values)
+        request.cr.commit()
 
     def _signup_with_values(self, token, values):
         db, login, password = request.registry['res.users'].signup(request.cr, openerp.SUPERUSER_ID, values, token)
@@ -104,5 +119,4 @@ class AuthSignup(openerp.addons.web.controllers.main.Home):
         if not uid:
             raise SignupError(_('Authentification Failed.'))
 
-
 # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index e91af657cc2..4c1c1a671b7 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -66,11 +66,12 @@ class res_partner(osv.Model):
                 self.signup_prepare(cr, uid, [partner.id], context=context)
                 partner.refresh()
 
+            route = 'login'
             # the parameters to encode for the query
             query = dict(db=cr.dbname)
             signup_type = context.get('signup_force_type_in_url', partner.signup_type or '')
             if signup_type:
-                query['mode'] = signup_type
+                route = 'reset_password' if signup_type == 'reset' else signup_type
 
             if partner.signup_token and signup_type:
                 query['token'] = partner.signup_token
@@ -89,7 +90,7 @@ class res_partner(osv.Model):
             if res_id:
                 fragment['id'] = res_id
 
-            res[partner.id] = urljoin(base_url, "/web/login?%s#%s" % (urlencode(query), urlencode(fragment)))
+            res[partner.id] = urljoin(base_url, "/web/%s?%s#%s" % (route, urlencode(query), urlencode(fragment)))
 
         return res
 
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
deleted file mode 100644
index a317440fd6b..00000000000
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ /dev/null
@@ -1,19 +0,0 @@
-openerp.auth_signup = function(instance) {
-    openerp.web.LoginForm.include({
-        start: function () {
-            var self = this;
-            this.$el.on('submit', function () {
-                var password = self.get_password_field('password');
-                var confirm_password = self.get_password_field('confirm_password');
-                if (password && confirm_password && (password.value != confirm_password.value)) {
-                    alert("Passwords do not match; please retype them.");
-                    return false;
-                }
-            });
-        },
-        get_password_field: function (field) {
-            var selector = 'input[name="' + field + '"][type="password"]:visible';
-            return this.$(selector)[0];
-        },
-    });
-};
diff --git a/addons/auth_signup/views/auth_signup_login.xml b/addons/auth_signup/views/auth_signup_login.xml
index a9e43c86f4f..ae813cc14ac 100644
--- a/addons/auth_signup/views/auth_signup_login.xml
+++ b/addons/auth_signup/views/auth_signup_login.xml
@@ -5,84 +5,94 @@
     <data>
         <template id="auth_signup.login" inherit_id="web.login" name="Sign up - Reset Password">
             <xpath expr="//button[@type='submit']" position="before">
-                <a t-if="signup" t-attf-href="?{{ keep_query('*', mode='signup') }}" class="btn btn-link pull-right">Sign up</a>
-                <a t-if="reset" t-attf-href="?{{ keep_query('*', mode='reset') }}" class="btn btn-link pull-right">Reset Password</a>
+                <a t-if="signup_enabled" t-attf-href="/web/signup?redirect=/web%3f{{ quote_plus(keep_query()) }}" class="btn btn-link pull-right">Sign up</a>
+                <a t-if="reset_password_enabled" t-attf-href="/web/reset_password?redirect=/web/login%3f{{ quote_plus(keep_query()) }}" class="btn btn-link pull-right">Reset Password</a>
             </xpath>
         </template>
 
-        <template id="auth_signup.signup" name="Sign up">
-            <t t-call="web.login_layout">
-                <t t-set="head">
-                    <t t-foreach="css" t-as="css_file">
-                        <link rel="stylesheet" t-att-href="css_file"/>
-                    </t>
-                    <t t-foreach="js" t-as="js_file">
-                        <script type="text/javascript" t-att-src="js_file"></script>
-                    </t>
-                </t>
-                <script type="text/javascript">
-                    $(function() {
-                        var s = new openerp.init(<t t-raw="modules"/>);
-                        var login_form = new openerp.web.LoginForm($('.oe_signup_form'));
-                    });
-                </script>
-
-                <t t-set="reset_without_token" t-value="mode == 'reset' and not token"/>
-
-                <form class="oe_signup_form" role="form" method="post">
-                    <t t-call="web.database_select"/>
-
-                    <div class="form-group field-name" t-if="not reset_without_token">
-                        <label for="name" class="control-label">Your Name</label>
-                        <input type="text" name="name" t-att-value="name" id="name" class="form-control" placeholder="e.g. John Doe"
-                            required="required" autofocus="autofocus" t-att-disabled="'disabled' if mode == 'reset' and token else None"/>
-                    </div>
+        <template id="auth_signup.fields" name="Auth Signup/ResetPassword form fields">
+            <t t-call="web.database_select"/>
 
-                    <div class="form-group field-login">
-                        <label for="login" class="control-label">Your Email</label>
-                        <input type="email" name="login" t-att-value="login" id="login" class="form-control"
-                            t-att-autofocus="'autofocus' if reset_without_token else None"
-                            required="required" t-att-disabled="'disabled' if mode == 'reset' and token else None"/>
-                        <input type="hidden" name="login" t-att-value="login" t-if="mode == 'reset' and token"/>
-                    </div>
+            <div class="form-group field-name">
+                <label for="name" class="control-label">Your Name</label>
+                <input type="text" name="name" t-att-value="name" id="name" class="form-control" placeholder="e.g. John Doe"
+                    required="required" t-att-autofocus="'autofocus' if not only_passwords else None" t-att-readonly="'readonly' if only_passwords else None"/>
+            </div>
 
-                    <div class="form-group field-password" t-if="not reset_without_token">
-                        <label for="password" class="control-label">Password</label>
-                        <input type="password" name="password" id="password" class="form-control"
-                            required="required" t-att-autofocus="'autofocus' if mode == 'reset' and token else None"/>
-                    </div>
+            <div class="form-group field-login">
+                <label for="login" class="control-label">Your Email</label>
+                <input type="text" name="login" t-att-value="login" id="login" class="form-control"
+                    required="required" t-att-readonly="'readonly' if only_passwords else None"/>
+            </div>
 
-                    <div class="form-group field-confirm_password" t-if="not reset_without_token">
-                        <label for="confirm_password" class="control-label">Confirm Password</label>
-                        <input type="password" name="confirm_password" id="confirm_password" class="form-control" required="required"/>
-                    </div>
+            <div class="form-group field-password">
+                <label for="password" class="control-label">Password</label>
+                <input type="password" name="password" autofocus="autofocus" id="password" class="form-control"
+                    required="required" t-att-autofocus="'autofocus' if only_passwords else None"/>
+            </div>
+
+            <div class="form-group field-confirm_password">
+                <label for="confirm_password" class="control-label">Confirm Password</label>
+                <input type="password" name="confirm_password" id="confirm_password" class="form-control" required="required"/>
+            </div>
+        </template>
+
+        <template id="auth_signup.signup" name="Sign up login">
+            <t t-call="web.login_layout">
+                <form class="oe_signup_form" role="form" t-attf-action="/web/signup{{ '?debug' if debug else '' }}" method="post" t-if="not message">
+
+                    <t t-call="auth_signup.fields"/>
 
                     <p class="alert alert-danger" t-if="error">
                         <t t-esc="error"/>
                     </p>
+                    <input type="hidden" name="redirect" t-att-value="redirect"/>
+                    <input type="hidden" name="token" t-att-value="token"/>
+                    <div class="clearfix oe_login_buttons">
+                        <a href="/web/login" class="btn btn-link pull-right">Back to Login</a>
+                        <button type="submit" class="btn btn-primary pull-left">Sign up</button>
+                    </div>
+
+                </form>
+            </t>
+        </template>
+
+        <template id="auth_signup.reset_password" name="Reset password">
+            <t t-call="web.login_layout">
+                <div t-if="message">
                     <p class="alert alert-success" t-if="message">
                         <t t-esc="message"/>
                     </p>
+                    <a href="/web/login" class="btn btn-link pull-right">Back to Login</a>
+                </div>
+
+                <form class="oe_reset_password_form" role="form" t-attf-action="/web/reset_password{{ '?debug' if debug else '' }}" method="post" t-if="not message">
+
+                    <t t-if="token">
+                        <t t-call="auth_signup.fields">
+                            <t t-set="only_passwords" t-value="1"/>
+                        </t>
+                    </t>
+
+                    <t t-if="not token">
+                        <div class="form-group field-login">
+                            <label for="login" class="control-label">Your Email</label>
+                            <input type="text" name="login" t-att-value="login" id="login" class="form-control"
+                                autofocus="autofocus" required="required"/>
+                        </div>
+                    </t>
 
+                    <p class="alert alert-danger" t-if="error">
+                        <t t-esc="error"/>
+                    </p>
                     <input type="hidden" name="redirect" t-att-value="redirect"/>
-                    <input type="hidden" name="mode" t-att-value="mode"/>
                     <input type="hidden" name="token" t-att-value="token"/>
                     <div class="clearfix oe_login_buttons">
-                        <a t-attf-href="?{{ keep_query('*', mode='login') }}" class="btn btn-link pull-right">Back to Login</a>
-                        <button type="submit" class="btn btn-primary pull-left">
-                            <t t-if="mode == 'signup'">Sign up</t>
-                            <t t-if="mode == 'reset'">Reset password</t>
-                        </button>
+                        <a href="/web/login" class="btn btn-link pull-right">Back to Login</a>
+                        <button type="submit" class="btn btn-primary pull-left">Reset password</button>
                     </div>
 
                 </form>
-                <div class="oe_single_form_footer" t-if="not disable_footer">
-                    <t t-if="not disable_database_manager">
-                        <a class="oe_login_manage_db" t-attf-href="/web/database/manager{{ '?debug' if debug else '' }}">Manage Databases</a>
-                        <span class="oe_footer_seperator"> | </span>
-                    </t>
-                    <a href="http://www.openerp.com" target="_blank">Powered by <span>OpenERP</span></a>
-                </div>
 
             </t>
         </template>
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 6eb9ebc591e..95c7ad82e2b 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -45,9 +45,8 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @http.route(website=True, auth="public", multilang=True)
     def web_login(self, *args, **kw):
-        response = super(Website, self).web_login(*args, **kw)
-        response.qcontext['disable_footer'] = True
-        return response
+        # TODO: can't we just put auth=public, ... in web client ?
+        return super(Website, self).web_login(*args, **kw)
 
     @http.route('/page/<page:page>', type='http', auth="public", website=True, multilang=True)
     def page(self, page, **opt):
@@ -383,7 +382,6 @@ class Website(openerp.addons.web.controllers.main.Home):
     #------------------------------------------------------
     # Server actions
     #------------------------------------------------------
-
     @http.route('/website/action/<path_or_xml_id_or_id>', type='http', auth="public", website=True)
     def actions_server(self, path_or_xml_id_or_id, **post):
         cr, uid, context = request.cr, request.uid, request.context