Fix for magic link with python 3

janeczku · May 26, 2019 · ed91048 · ed91048
1 parent e6ff2f1
commit ed91048
Show file tree

Hide file tree

Showing 6 changed files with 248 additions and 242 deletions.
diff --git a/cps/templates/readpdf.html b/cps/templates/readpdf.html
@@ -124,7 +124,7 @@
               <span data-l10n-id="print_label">Print</span>
             </button>
 
-            <button id="secondaryDownload" class="secondaryToolbarButton download visibleMediumView" title="Download" tabindex="54" data-l10n-id="download">
+            <button id="secondaryDownload" class="secondaryToolbarButton download visibleMediumView" title="Download" tabindex="54" data-l10n-id="download" {% if not g.user.role_download() %} style="display:none;" {% endif %}>
               <span data-l10n-id="download_label">Download</span>
             </button>
 
@@ -227,7 +227,7 @@
                   <span data-l10n-id="print_label">Print</span>
                 </button>
 
-                <button id="download" class="toolbarButton download hiddenMediumView" title="Download" tabindex="34" data-l10n-id="download">
+                <button id="download" class="toolbarButton download hiddenMediumView" title="Download" tabindex="34" data-l10n-id="download" {% if not g.user.role_download() %} style="display:none;" {% endif %}>
                   <span data-l10n-id="download_label">Download</span>
                 </button>
                 <a href="#" id="viewBookmark" class="toolbarButton bookmark hiddenSmallView" title="Current view (copy or open in new window)" tabindex="35" data-l10n-id="bookmark">

diff --git a/cps/templates/remote_login.html b/cps/templates/remote_login.html
@@ -3,13 +3,13 @@
 <div class="well">
   <h2 style="margin-top: 0">{{_('Remote login')}}</h2>
   <p>
-    {{_('Using your another device, visit')}} <a href="{{verify_url}}">{{verify_url}}</a> {{_('and log in')}}.
+    {{_('Using your another device, login and visit ')}} <a href="{{verify_url}}">{{verify_url}}</a>.
   </p>
   <p>
     {{_('Once you do so, you will automatically get logged in on this device.')}}
   </p>
   <p>
-    {{_('The link will expire after %s minutes.' % 10)}}
+    {{_('The link will expire after 10 minutes.')}}
   </p>
 </div>
 {% endblock %}

diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo