Merge pull request #6370 from freedomofpress/backport-6368

[2.3.0] Backport fixes to min-length message gettext formatting.
freedomofpress · Mar 29, 2022 · d5ec053 · d5ec053
2 parents 4c07df0 + d2a5962
commit d5ec053
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/securedrop/source_app/main.py b/securedrop/source_app/main.py
@@ -204,7 +204,7 @@ def submit(logged_in_source: SourceUser) -> werkzeug.Response:
             min_len = InstanceConfig.get_default().initial_message_min_len
             if (min_len > 0) and (msg and not fh) and (len(msg) < min_len):
                 flash(gettext(
-                    "Your first message must be at least {} characters long.".format(min_len)),
+                    "Your first message must be at least {} characters long.").format(min_len),
                     "error")
                 return redirect(url_for('main.lookup'))
 

diff --git a/securedrop/source_templates/lookup.html b/securedrop/source_templates/lookup.html
@@ -46,11 +46,11 @@ <h2 id="submit-heading" class="headline">{{ gettext('Submit Messages') }}</h2>
         {{ form.msg(class="fill-parent") }}
   {% if allow_document_uploads %}
       {% if min_len > 0 %}
-         <p class="center" id="min-msg-length">{{ gettext('If you are only sending a message, it must be at least {} characters long.'.format(min_len)) }}</p>
+         <p class="center" id="min-msg-length">{{ gettext('If you are only sending a message, it must be at least {} characters long.').format(min_len) }}</p>
       {% endif %}
   {% else %}
       {% if min_len > 0 %}
-        <p class="center" id="min-msg-length">{{ gettext('Your first message must be at least {} characters long.'.format(min_len)) }}</p>
+        <p class="center" id="min-msg-length">{{ gettext('Your first message must be at least {} characters long.').format(min_len) }}</p>
       {% endif %}
   {% endif %}
       </div>