Merge pull request #553 from coders4help/develop

Apply fixes for release
coders4help · Apr 2, 2022 · 7027789 · 7027789
2 parents 5a2f0ed + e35f015
commit 7027789
Show file tree

Hide file tree

Showing 99 changed files with 3,032 additions and 396 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/requirements" # Location of package manifests
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -1,6 +1,13 @@
 name: Check & Test
 
-on: [push, pull_request]
+on: 
+  push:
+    branches:
+      - develop
+      - main
+      - master
+      - release/*
+  pull_request:
 
 jobs:
   check-migrations:

diff --git a/accounts/templates/shift_list.html b/accounts/templates/shift_list.html
@@ -9,60 +9,60 @@
 
     <ul class="list-group">
         {% if shifts_today.count > 0  %}
-            {% trans 'My shifts today:' %}
+            {% translate 'My shifts today:' %}
         {% else %}
-            {% trans 'No shifts today.' %}
+            {% translate 'No shifts today.' %}
         {% endif %}
 
         {% for shifts in shifts_today %}
             <li class="list-group-item list-group-item-info">{{ shifts.shift }}
-                <a href="{{shifts.shift.get_absolute_url}}/direct/" class="btn btn-default">{% trans 'Show this work shift' %}</a>
+                <a href="{{shifts.shift.get_absolute_url}}/direct/" class="btn btn-default">{% translate 'Show this work shift' %}</a>
             </li>
         {% endfor %}
     </ul>
 
     <ul class="list-group">
         {% if shifts_tomorrow.count > 0  %}
-            {% trans 'My shifts tomorrow:' %}
+            {% translate 'My shifts tomorrow:' %}
         {% else %}
-            {% trans 'No shifts tomorrow.' %}
+            {% translate 'No shifts tomorrow.' %}
         {% endif %}
 
         {% for shifts in shifts_tomorrow %}
             <li class="list-group-item list-group-item-info">{{ shifts.shift }}
-                <a href="{{shifts.shift.get_absolute_url}}/direct/" class="btn btn-default">{% trans 'Show this work shift' %}</a>
+                <a href="{{shifts.shift.get_absolute_url}}/direct/" class="btn btn-default">{% translate 'Show this work shift' %}</a>
             </li>
         {% endfor %}
     </ul>
 
     <ul class="list-group">
         {% if shifts_day_after_tomorrow.count > 0  %}
-            {% trans 'My shifts the day after tomorrow:' %}
+            {% translate 'My shifts the day after tomorrow:' %}
         {% else %}
-            {% trans 'No shifts the day after tomorrow.' %}
+            {% translate 'No shifts the day after tomorrow.' %}
         {% endif %}
 
         {% for shifts in shifts_day_after_tomorrow %}
             <li class="list-group-item list-group-item-info">{{ shifts.shift }}
-                <a href="{{shifts.shift.get_absolute_url}}/direct/" class="btn btn-default">{% trans 'Show this work shift' %}</a>
+                <a href="{{shifts.shift.get_absolute_url}}/direct/" class="btn btn-default">{% translate 'Show this work shift' %}</a>
             </li>
         {% endfor %}
     </ul>
 
     <ul class="list-group">
         {% if shifts_further_future.count > 0  %}
-            {% trans 'Further shifts:' %}
+            {% translate 'Further shifts:' %}
         {% else %}
-            {% trans 'No further shifts.' %}
+            {% translate 'No further shifts.' %}
         {% endif %}
 
         {% for shifts in shifts_further_future %}
             <li class="list-group-item list-group-item-info">{{ shifts.shift }}
-                <a href="{{shifts.shift.get_absolute_url}}/direct/" class="btn btn-default">{% trans 'Show this work shift' %}</a>
+                <a href="{{shifts.shift.get_absolute_url}}/direct/" class="btn btn-default">{% translate 'Show this work shift' %}</a>
             </li>
 
         {% endfor %}
     </ul>
-    <a href="{% url 'shift_list_done' %}" class="btn btn-default">{% trans 'Show my work shifts in the past' %}</a>
+    <a href="{% url 'shift_list_done' %}" class="btn btn-default">{% translate 'Show my work shifts in the past' %}</a>
 </div>
-{% endblock %}
+{% endblock %}
diff --git a/accounts/templates/shift_list_done.html b/accounts/templates/shift_list_done.html
@@ -9,15 +9,15 @@
 
     <ul class="list-group">
         {% if shifts_past.count > 0  %}
-            {% trans 'My work shifts in the past:' %}
+            {% translate 'My work shifts in the past:' %}
         {% else %}
-            {% trans 'No work shifts in the past days yet.' %}
+            {% translate 'No work shifts in the past days yet.' %}
         {% endif %}
 
         {% for shifts in shifts_past %}
             <li class="list-group-item list-group-item-info">{{ shifts.shift }}</li>
         {% endfor %}
     </ul>
-    <a href="{% url 'shift_list_active' %}" class="btn btn-default">{% trans 'Show my work shifts in the future' %}</a>
+    <a href="{% url 'shift_list_active' %}" class="btn btn-default">{% translate 'Show my work shifts in the future' %}</a>
 </div>
-{% endblock %}
+{% endblock %}
diff --git a/accounts/templates/user_account_delete.html b/accounts/templates/user_account_delete.html
@@ -7,15 +7,15 @@
 {% block content %}
     <div class="col-md-8 col-md-offset-2">
          <ul class="list-group">
-             <li class="list-group-item list-group-item-info">{% trans 'Username' %}: {{ user.username }}</li>
-             <li class="list-group-item list-group-item-info">{% trans 'First name' %}: {{ user.first_name }}</li>
-             <li class="list-group-item list-group-item-info">{% trans 'Last name' %}: {{ user.last_name }}</li>
-             <li class="list-group-item list-group-item-info">{% trans 'Email' %}: {{ user.email }}</li>
+             <li class="list-group-item list-group-item-info">{% translate 'Username' %}: {{ user.username }}</li>
+             <li class="list-group-item list-group-item-info">{% translate 'First name' %}: {{ user.first_name }}</li>
+             <li class="list-group-item list-group-item-info">{% translate 'Last name' %}: {{ user.last_name }}</li>
+             <li class="list-group-item list-group-item-info">{% translate 'Email' %}: {{ user.email }}</li>
          </ul>
-        {% trans 'If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore.' %}
-        {% trans 'Its not possible to recover this information. If you want to work as volunteer again, you will have to create a new account.' %}
+        {% translate 'If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore.' %}
+        {% translate 'Its not possible to recover this information. If you want to work as volunteer again, you will have to create a new account.' %}
         <div>
-            <a href="{% url 'account_delete_final' %}" class="btn btn-danger">{% trans 'Delete Account (no additional warning)' %}</a>
+            <a href="{% url 'account_delete_final' %}" class="btn btn-danger">{% translate 'Delete Account (no additional warning)' %}</a>
         </div>
     </div>
-{% endblock %}
+{% endblock %}
diff --git a/accounts/templates/user_account_edit.html b/accounts/templates/user_account_edit.html
@@ -9,7 +9,7 @@
     <form action="." method="POST">
         {% csrf_token %}
         {{ form.as_p }}
-        <input class="button" type="submit" value="{% trans 'Save' %}">
+        <input class="button" type="submit" value="{% translate 'Save' %}">
     </form>
 </div>
 {% endblock %}
diff --git a/accounts/templates/user_detail.html b/accounts/templates/user_detail.html
@@ -7,14 +7,14 @@
 {% block content %}
 <div class="col-md-8 col-md-offset-2">
     <ul class="list-group">
-        <li class="list-group-item list-group-item-info">{% trans 'Username' %}: {{ user.username }}</li>
-        <li class="list-group-item list-group-item-info">{% trans 'First name' %}: {{ user.first_name }}</li>
-        <li class="list-group-item list-group-item-info">{% trans 'Last name' %}: {{ user.last_name }}</li>
-        <li class="list-group-item list-group-item-info">{% trans 'Email' %}: {{ user.email }}</li>
+        <li class="list-group-item list-group-item-info">{% translate 'Username' %}: {{ user.username }}</li>
+        <li class="list-group-item list-group-item-info">{% translate 'First name' %}: {{ user.first_name }}</li>
+        <li class="list-group-item list-group-item-info">{% translate 'Last name' %}: {{ user.last_name }}</li>
+        <li class="list-group-item list-group-item-info">{% translate 'Email' %}: {{ user.email }}</li>
     </ul>
     <div>
-        <a href="{% url 'account_edit' %}" class="btn btn-default">{% trans 'Edit Account' %}</a>
-        <a href="{% url 'account_delete' %}" class="btn btn-danger">{% trans 'Delete Account' %}</a>
+        <a href="{% url 'account_edit' %}" class="btn btn-default">{% translate 'Edit Account' %}</a>
+        <a href="{% url 'account_delete' %}" class="btn btn-danger">{% translate 'Delete Account' %}</a>
     </div>
 </div>
 {% endblock %}
diff --git a/accounts/templates/user_detail_deleted.html b/accounts/templates/user_detail_deleted.html
@@ -3,6 +3,6 @@
 
 {% block content %}
 <div class="col-md-8 col-md-offset-2">
-    {% trans 'Your user account has been deleted.' %}
+    {% translate 'Your user account has been deleted.' %}
 </div>
 {% endblock %}
diff --git a/content/templates/flatpages/additional_flat_page_style_inline.html b/content/templates/flatpages/additional_flat_page_style_inline.html
@@ -9,7 +9,7 @@ <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
              id="{{ inline_admin_formset.formset.prefix }}-
                      {% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}">
             {% if inline_admin_form.show_url %}
-                <a href="{{ inline_admin_form.absolute_url }}">{% trans "View on site" %}</a>{% endif %}
+                <a href="{{ inline_admin_form.absolute_url }}">{% translate "View on site" %}</a>{% endif %}
             {% if inline_admin_formset.formset.can_delete and inline_admin_form.original %}
                 <span class="delete">{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}</span>{% endif %}
             </h3>
@@ -29,8 +29,8 @@ <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
         $("#{{ inline_admin_formset.formset.prefix }}-group .inline-related").stackedFormset({
             prefix: '{{ inline_admin_formset.formset.prefix }}',
             adminStaticPrefix: '{% static "admin/" %}',
-            deleteText: "{% trans "Remove" %}",
-            addText: "{% blocktrans with verbose_name=inline_admin_formset.opts.verbose_name|capfirst %}Add another {{ verbose_name }}{% endblocktrans %}"
+            deleteText: "{% translate "Remove" %}",
+            addText: "{% blocktranslate with verbose_name=inline_admin_formset.opts.verbose_name|capfirst %}Add another {{ verbose_name }}{% endblocktranslate %}"
         });
     })(django.jQuery);
 </script>
diff --git a/content/templates/flatpages/default.html b/content/templates/flatpages/default.html
@@ -20,7 +20,7 @@
 
     {% if perms.flatpages.can_change_page %}
         <hr/>
-        <a href="{% url 'admin:flatpages_flatpage_change' flatpage.id %}">{% trans "Edit this page" %}</a>
+        <a href="{% url 'admin:flatpages_flatpage_change' flatpage.id %}">{% translate "Edit this page" %}</a>
     {% endif %}
 
 {% endblock %}

diff --git a/locale/ar/LC_MESSAGES/django.po b/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: volunteer-planner.org\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-30 18:28+0200\n"
+"POT-Creation-Date: 2022-04-02 18:42+0200\n"
 "PO-Revision-Date: 2022-03-15 17:56+0000\n"
 "Last-Translator: Christoph Meißner\n"
 "Language-Team: Arabic (http://www.transifex.com/coders4help/volunteer-planner/language/ar/)\n"
@@ -734,6 +734,9 @@ msgstr ""
 msgid "scheduler"
 msgstr ""
 
+msgid "Write a message"
+msgstr ""
+
 msgid "slots"
 msgstr ""
 
@@ -774,6 +777,48 @@ msgstr ""
 msgid "shift helpers"
 msgstr ""
 
+msgid "shift notification"
+msgid_plural "shift notifications"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+msgid "Message"
+msgstr ""
+
+msgid "sender"
+msgstr ""
+
+msgid "send date"
+msgstr ""
+
+msgid "Shift"
+msgstr ""
+
+msgid "recipients"
+msgstr ""
+
+#, python-brace-format
+msgid "Volunteer-Planner: A Message from shift manager of {shift_title}"
+msgstr ""
+
+#, python-format
+msgid ""
+"Hello %(recipient)s,\n"
+"The shift manager of the shift %(shift_title)s at %(location)s wants to let you know:\n"
+"----------------------\n"
+"%(message)s\n"
+"----------------------\n"
+"Please reply to %(sender_email)s for further questions.\n"
+"\n"
+"\n"
+"Best,\n"
+"Your volunteer-planner.org team\n"
+msgstr ""
+
 msgctxt "helpdesk shifts heading"
 msgid "shifts"
 msgstr ""
@@ -835,6 +880,9 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
+msgid "Send message"
+msgstr ""
+
 msgid "You"
 msgstr ""
 
@@ -845,6 +893,9 @@ msgstr ""
 msgid "Covered"
 msgstr ""
 
+msgid "Send email to all volunteers"
+msgstr ""
+
 msgid "Drop out"
 msgstr ""
 
@@ -860,6 +911,12 @@ msgstr ""
 msgid "Become member"
 msgstr ""
 
+msgid "send"
+msgstr ""
+
+msgid "cancel"
+msgstr ""
+
 #, python-format
 msgid ""
 "\n"
@@ -880,6 +937,21 @@ msgstr ""
 msgid "Members only"
 msgstr ""
 
+#, python-format
+msgid ""
+"Hello %(recipient)s,\n"
+"\n"
+"The shift manager of the shift %(shift_title)s at %(location)s wants to let you know:\n"
+"----------------------\n"
+"%(message)s\n"
+"----------------------\n"
+"Please reply to %(sender_email)s for further questions.\n"
+"\n"
+"\n"
+"Best,\n"
+"Your volunteer-planner.org team\n"
+msgstr ""
+
 #, python-format
 msgid ""
 "\n"
@@ -931,6 +1003,12 @@ msgstr ""
 msgid "You successfully left this shift."
 msgstr ""
 
+msgid "You have no permissions to send emails!"
+msgstr ""
+
+msgid "Email has been sent."
+msgstr ""
+
 #, python-brace-format
 msgid "A shift already exists at {date}"
 msgid_plural "{num_shifts} shifts already exists at {date}"