Project

General

Profile

0001-views-show-oauth2-client-in-confirm-form-fixes-22934.patch

Benjamin Dauvergne, 30 Mar 2018 07:00 PM

Download (3.23 KB)

View differences:

Subject: [PATCH] views: show oauth2 client in confirm form (fixes #22934)

 fargo/locale/fr/LC_MESSAGES/django.po     | 14 +++++++-------
 fargo/oauth2/views.py                     |  3 ++-
 fargo/templates/fargo/oauth2/confirm.html |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)
fargo/locale/fr/LC_MESSAGES/django.po
7 7
msgstr ""
8 8
"Project-Id-Version: fargo 0\n"
9 9
"Report-Msgid-Bugs-To: \n"
10
"POT-Creation-Date: 2018-03-30 16:45+0000\n"
10
"POT-Creation-Date: 2018-03-30 16:58+0000\n"
11 11
"PO-Revision-Date: 2018-03-17 17:31+0100\n"
12 12
"Last-Translator: Frederic Peters <fpeters@entrouvert.com>\n"
13 13
"Language: French\n"
......
182 182
msgid "redirect URIs"
183 183
msgstr "URIs de redirection"
184 184

  
185
#: fargo/oauth2/views.py:219
185
#: fargo/oauth2/views.py:220
186 186
msgid "This document is already in your portfolio"
187 187
msgstr "Ce document est déjà enregistré."
188 188

  
189
#: fargo/oauth2/views.py:222
189
#: fargo/oauth2/views.py:223
190 190
msgid "The document has not been uploaded"
191 191
msgstr "Aucun document n'a été déposé."
192 192

  
......
234 234
#, python-format
235 235
msgid ""
236 236
"\n"
237
"        Do you accept to add <em class=\"filename\">%(filename)s</em> to "
238
"your portfolio?\n"
237
"        The service %(oauth2_client)s want to add the document \"<em class="
238
"\"filename\">%(filename)s</em>\" to your portfolio ?\n"
239 239
"      "
240 240
msgstr ""
241 241
"\n"
242
"        Acceptez-vous d'ajouter<em class\"filename\">%(filename)s</en> à vos "
243
"documents ?\n"
242
"        Le site %(oauth2_client)s souhaite ajouter le document «&nbsp;<em "
243
"class=\"filename\">%(filename)s</em>&nbsp;» à vos documents.\n"
244 244
"      "
245 245

  
246 246
#: fargo/templates/fargo/oauth2/confirm.html:21
fargo/oauth2/views.py
207 207
        return super(OAuth2AuthorizePutView, self).dispatch(request)
208 208

  
209 209
    def get_context_data(self, **kwargs):
210

  
211 210
        if self.oauth2_document:
211
            kwargs['oauth2_document'] = self.oauth2_document
212
            kwargs['oauth2_client'] = self.oauth2_document.client
212 213
            # verify if document already exists
213 214
            if not UserDocument.objects.filter(
214 215
                    user=self.request.user,
fargo/templates/fargo/oauth2/confirm.html
11 11
  {% else %}
12 12
    {% block form-intro %}
13 13
      <p>{% blocktrans %}
14
        Do you accept to add <em class="filename">{{ filename }}</em> to your portfolio?
14
        The service {{ oauth2_client }} want to add the document "<em class="filename">{{ filename }}</em>" to your portfolio ?
15 15
      {% endblocktrans %}</p>
16 16
    {% endblock %}
17 17
    {% block form %}
18
-