Merge tag 'tags/v1.2.136' into update/1.2.136

 * Merge pull request rapidpro#1249 from rapidpro/update-python

.github/workflows/ci.yml

@@ -3,35 +3,32 @@ on: [push, pull_request]
 jobs:
   test:
     name: Test
-    strategy:
-      matrix:
-        python-version: ["3.10.x", "3.11.x"]
-        django-version: ["4.2.x", "5.0.x"]
-    env:
-      redis-version: "6.2"
-      pg-version: "15"
     runs-on: ubuntu-22.04
+    env:
+      python-version: "3.12.x"
+    services:
+      redis:
+        image: redis:6.2-alpine
+        ports:
+          - 6379:6379
+      postgres:
+        image: postgis/postgis:15-3.3-alpine
+        env:
+          POSTGRES_DB: ureport
+          POSTGRES_USER: ureport
+          POSTGRES_PASSWORD: nyaruka
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
     steps:
     - name: Checkout code
-      uses: actions/checkout@v1
-
-    - name: Install PostgreSQL
-      uses: harmon758/postgresql-action@v1
-      with:
-        postgresql version: ${{ env.pg-version }}
-        postgresql db: ureport
-        postgresql user: ureport
-        postgresql password: nyaruka
-
-    - name: Install Redis
-      uses: zhulik/redis-action@v1.0.0
-      with:
-        redis version: ${{ env.redis-version }}
+      uses: actions/checkout@v4
 
     - name: Install Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v5
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: ${{ env.python-version }}
 
     - name: Install Poetry
       uses: snok/install-poetry@v1
@@ -41,7 +38,6 @@ jobs:
     - name: Initialize environment
       run: |
         poetry install --no-root
-        poetry add django==${{ matrix.django-version }}
         sudo npm install -g coffee-script less
         ln -s ${{ github.workspace }}/ureport/settings.py.postgres ${{ github.workspace }}/ureport/settings.py
 
@@ -60,7 +56,7 @@ jobs:
 
     - name: Upload coverage
       if: success()
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         fail_ci_if_error: true

CHANGELOG.md

@@ -1,3 +1,139 @@
+v1.2.136 (2024-10-24)
+-------------------------
+ * Merge pull request #1249 from rapidpro/update-python
+
+v1.2.134 (2024-10-23)
+-------------------------
+ * Update deps
+ * Support django 5.1
+ * Adjust old migrations to not use index_together
+ * Use GH actions services for Redis and Postgres
+
+v1.2.133 (2024-09-26)
+-------------------------
+ * Add lock to run the contacts activities squash once
+
+v1.2.132 (2024-09-24)
+-------------------------
+ * Squash contacts activities counts every 15min
+ * Run code checks
+ * Translate locale/en/LC_MESSAGES/django.po in cs
+
+v1.2.131 (2024-09-18)
+-------------------------
+ * Set the max length for poll result text
+ * Do not sync empty contacts not having URNs set
+
+v1.2.130 (2024-08-28)
+-------------------------
+ * Merge pull request #1239 from rapidpro/extra-menu
+ * Use extra menu link config for global site
+
+v1.2.129 (2024-08-28)
+-------------------------
+ * Merge pull request #1236 from rapidpro/extra-menu
+ * Merge pull request #1238 from rapidpro/add-dominicana
+ * Fix name
+ * Add support for extra link on menu
+
+v1.2.128 (2024-08-28)
+-------------------------
+ * Merge pull request #1237 from rapidpro/add-dominicana
+ * Merge pull request #1235 from rapidpro/fix-index-together-unique-toghether-use
+ * Add Dominicana link
+ * Merge pull request #1233 from rapidpro/updates
+ * Adjust indexes and constraints
+ * Update deps
+ * Merge pull request #1231 from rapidpro/update-deps
+ * Update sentry-sdk
+ * Update deps
+ * Reduce size of logo images to load faster on pages
+
+v1.2.127 (2024-07-26)
+-------------------------
+ * Merge pull request #1229 from rapidpro/kazakh-unicef-logo
+ * Adjust UNICEF logo for Kazakh
+ * Merge pull request #1228 from rapidpro/update_dash
+ * Update dash to order admins on org forms
+
+v1.2.126 (2024-07-12)
+-------------------------
+ * Merge pull request #1227 from rapidpro/add-kazakhstan
+ * Add Kazakhstan
+
+v1.2.125 (2024-07-11)
+-------------------------
+ * Merge pull request #1226 from rapidpro/update-deps
+ * Update JS deps
+ * Merge pull request #1225 from rapidpro/update-deps
+ * Run code checks
+ * Update deps
+
+v1.2.124 (2024-07-09)
+-------------------------
+ * Merge pull request #1223 from rapidpro/kaz-updates
+ * Fix type for Macedonia
+ * Update KK translations
+
+v1.2.123 (2024-07-02)
+-------------------------
+ * Merge pull request #1222 from rapidpro/use-py-3.11
+
+v1.2.119 (2024-06-28)
+-------------------------
+ * Merge pull request #1220 from rapidpro/GA4
+ * Merge pull request #1221 from rapidpro/fix-polls-queries-for-sync
+ * Make sure polls with inactive category are hidden from the public
+ * Support GA4 measurement ID
+ * fix queries for polls used to sync results to always sync polls even if there categories are inactive
+
+v1.2.118 (2024-06-06)
+-------------------------
+ * Merge pull request #1219 from rapidpro/add-kazakh
+ * Add Kazakh
+
+v1.2.117 (2024-05-29)
+-------------------------
+ * Fix extra spaces typo
+
+v1.2.116 (2024-05-24)
+-------------------------
+ * Merge pull request #1218 from rapidpro/support-IG-deeplinks
+ * Add config for Instagram deeplink checkbox
+
+v1.2.115 (2024-05-23)
+-------------------------
+ * Merge pull request #1214 from rapidpro/support-IG-deeplinks
+ * Run poetry lock
+ * Add Instagram deeplink on join page
+ * Merge pull request #1212 from rapidpro/update-CI-actions
+ * Update Github actions to latest versions
+
+v1.2.114 (2024-05-02)
+-------------------------
+ * Merge pull request #1210 from rapidpro/fix-homepage-poll-bg-color-new-brand
+
+v1.2.112 (2024-04-17)
+-------------------------
+ * Merge pull request #1209 from rapidpro/fix-stories-api
+ * Run code checks
+ * Fix stories API queryset
+ * Merge pull request #1208 from rapidpro/update-deps
+ * Update deps
+ * Merge pull request #1207 from rapidpro/update-deps
+ * Update deps
+ * Merge pull request #1206 from rapidpro/dependabot/pip/gunicorn-22.0.0
+ * Bump gunicorn from 20.1.0 to 22.0.0
+
+v1.2.111 (2024-04-16)
+-------------------------
+ * Merge pull request #1205 from rapidpro/update-depsss
+ * Run poetry lock
+ * Run poetry lock
+ * Test on Django 5.0.x only
+ * Merge pull request #1202 from Ilhasoft/fix/check-new-brand-in-rtl-orgs
+ * Check new brand in RTL organizations
+
 v1.2.110 (2024-04-16)
 -------------------------
  * Merge pull request #1201 from rapidpro/fix-drf-base-template

code_check.py

@@ -77,7 +77,7 @@ def get_current_msgids():
     status("Running black")
     cmd("black ureport")
     status("Running ruff")
-    cmd("ruff ureport")
+    cmd("ruff check ureport")
     status("Running isort")
     cmd("isort ureport")
     status("Updating locale PO files")

locale/ar/LC_MESSAGES/django.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 10:03+0000\n"
+"POT-Creation-Date: 2024-08-28 18:22+0000\n"
 "PO-Revision-Date: 2019-05-15 20:27+0000\n"
 "Last-Translator: Abraham Okiror <okiroribra@gmail.com>, 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/rapidpro/teams/226/ar/)\n"
@@ -692,8 +692,8 @@ msgstr "إدخال"
 msgid "Form"
 msgstr "نموذج"
 
-msgid "Save Changes"
-msgstr "حفظ التغييرات"
+msgid "Save"
+msgstr ""
 
 #, python-format
 msgid "Your new %s has been created."
@@ -1144,11 +1144,6 @@ msgstr ""
 msgid "Want to tell the world about this? Download this image to easily share on social media or for a beautiful presentation!"
 msgstr ""
 
-#, fuzzy
-#| msgid "Create"
-msgid "Co-Create"
-msgstr "إنشاء "
-
 msgid "SELECT LANGUAGE"
 msgstr ""
 
@@ -1856,6 +1851,14 @@ msgstr "النص القصير المستخدم لتوجيه الزائرين ل
 msgid "The call to action text to join on the top section on U-Report"
 msgstr ""
 
+msgid "A short text for the extra menu."
+msgstr ""
+
+#, fuzzy
+#| msgid "The location for this response"
+msgid "The link for the extra menu."
+msgstr "الموقع الجغرافي الذي أتى منه هذا الرد "
+
 msgid "The YouTube video ID for how to join U-Report section"
 msgstr ""
 
@@ -1936,6 +1939,11 @@ msgstr ""
 msgid "The Instagram username for this organization"
 msgstr "اسم حساب الإنستغرام الخاص بهذه المؤسسة"
 
+#, fuzzy
+#| msgid "The Instagram username for this organization"
+msgid "The Instagram username should be shown on the join page as deeplink for this organization"
+msgstr "اسم حساب الإنستغرام الخاص بهذه المؤسسة"
+
 msgid "The Instagram widget id from lightwidget.com"
 msgstr "هوية تطبيق انستغرام المصغر من lightwidget.com"
 
@@ -2062,9 +2070,12 @@ msgid "West and Central Africa"
 msgstr ""
 
 #, fuzzy
-#~| msgid "U-Report"
-#~ msgid "Ureport API"
-#~ msgstr "يو-ريبورت"
+#~| msgid "Create"
+#~ msgid "Co-Create"
+#~ msgstr "إنشاء "
+
+#~ msgid "Save Changes"
+#~ msgstr "حفظ التغييرات"
 
 #, fuzzy
 #~| msgid "The title for this item"

locale/bg/LC_MESSAGES/django.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 10:03+0000\n"
+"POT-Creation-Date: 2024-08-28 18:22+0000\n"
 "PO-Revision-Date: 2019-05-15 20:27+0000\n"
 "Last-Translator: Stanislav Dodov <stanislav.dodov@gmail.com>, 2020\n"
 "Language-Team: Bulgarian (https://www.transifex.com/rapidpro/teams/226/bg/)\n"
@@ -693,8 +693,8 @@ msgstr "Предай"
 msgid "Form"
 msgstr "От"
 
-msgid "Save Changes"
-msgstr "Запази промените"
+msgid "Save"
+msgstr ""
 
 #, python-format
 msgid "Your new %s has been created."
@@ -1136,11 +1136,6 @@ msgstr "Експортирай и сподели"
 msgid "Want to tell the world about this? Download this image to easily share on social media or for a beautiful presentation!"
 msgstr "Искаш ли светът да узнае за това? Изтегли го като изображение, за да го споделиш в социалните мрежи или за да го приложиш в страхотна презентация!"
 
-#, fuzzy
-#| msgid "Create"
-msgid "Co-Create"
-msgstr "Създай"
-
 msgid "SELECT LANGUAGE"
 msgstr ""
 
@@ -1876,6 +1871,14 @@ msgstr "Краткият текст, който насочва посетите
 msgid "The call to action text to join on the top section on U-Report"
 msgstr "Заглавието на секцията със снимки на началната страница на U-Report "
 
+msgid "A short text for the extra menu."
+msgstr ""
+
+#, fuzzy
+#| msgid "The location for this response"
+msgid "The link for the extra menu."
+msgstr "Местоположението, от където идва този отговор "
+
 msgid "The YouTube video ID for how to join U-Report section"
 msgstr "Идентификация на YouTube клипа за това как да се присъедините към U-Report"
 
@@ -1956,6 +1959,11 @@ msgstr "Идентификация на Facebook Pixel за тази орган
 msgid "The Instagram username for this organization"
 msgstr "Потребителското име в Instagram за тази организация"
 
+#, fuzzy
+#| msgid "The Instagram username for this organization"
+msgid "The Instagram username should be shown on the join page as deeplink for this organization"
+msgstr "Потребителското име в Instagram за тази организация"
+
 msgid "The Instagram widget id from lightwidget.com"
 msgstr "Instagram етикет за приложение от lightwidget.com"
 
@@ -2081,6 +2089,14 @@ msgstr ""
 msgid "West and Central Africa"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Create"
+#~ msgid "Co-Create"
+#~ msgstr "Създай"
+
+#~ msgid "Save Changes"
+#~ msgstr "Запази промените"
+
 #~ msgid "Photos"
 #~ msgstr "Снимки"