Skip to content

Commit c6e84d9

Browse files
lucaslinhareslucaslinhares
authored
Merge pull request #187 from Ilhasoft/update/1.2.136
Update/1.2.136
2 parents 3838303 + a0ff343 commit c6e84d9

File tree

115 files changed

+4710
-1488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+4710
-1488
lines changed

‎.github/workflows/ci.yml

+21-25
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,32 @@ on: [push, pull_request]
33
jobs:
44
test:
55
name: Test
6-
strategy:
7-
matrix:
8-
python-version: ["3.10.x", "3.11.x"]
9-
django-version: ["4.2.x", "5.0.x"]
10-
env:
11-
redis-version: "6.2"
12-
pg-version: "15"
136
runs-on: ubuntu-22.04
7+
env:
8+
python-version: "3.12.x"
9+
services:
10+
redis:
11+
image: redis:6.2-alpine
12+
ports:
13+
- 6379:6379
14+
postgres:
15+
image: postgis/postgis:15-3.3-alpine
16+
env:
17+
POSTGRES_DB: ureport
18+
POSTGRES_USER: ureport
19+
POSTGRES_PASSWORD: nyaruka
20+
ports:
21+
- 5432:5432
22+
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
23+
1424
steps:
1525
- name: Checkout code
16-
uses: actions/checkout@v1
17-
18-
- name: Install PostgreSQL
19-
uses: harmon758/postgresql-action@v1
20-
with:
21-
postgresql version: ${{ env.pg-version }}
22-
postgresql db: ureport
23-
postgresql user: ureport
24-
postgresql password: nyaruka
25-
26-
- name: Install Redis
27-
uses: zhulik/[email protected]
28-
with:
29-
redis version: ${{ env.redis-version }}
26+
uses: actions/checkout@v4
3027

3128
- name: Install Python
32-
uses: actions/setup-python@v1
29+
uses: actions/setup-python@v5
3330
with:
34-
python-version: ${{ matrix.python-version }}
31+
python-version: ${{ env.python-version }}
3532

3633
- name: Install Poetry
3734
uses: snok/install-poetry@v1
@@ -41,7 +38,6 @@ jobs:
4138
- name: Initialize environment
4239
run: |
4340
poetry install --no-root
44-
poetry add django==${{ matrix.django-version }}
4541
sudo npm install -g coffee-script less
4642
ln -s ${{ github.workspace }}/ureport/settings.py.postgres ${{ github.workspace }}/ureport/settings.py
4743
@@ -60,7 +56,7 @@ jobs:
6056
6157
- name: Upload coverage
6258
if: success()
63-
uses: codecov/codecov-action@v1
59+
uses: codecov/codecov-action@v4
6460
with:
6561
token: ${{ secrets.CODECOV_TOKEN }}
6662
fail_ci_if_error: true

‎CHANGELOG.md

+136
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,139 @@
1+
v1.2.136 (2024-10-24)
2+
-------------------------
3+
* Merge pull request #1249 from rapidpro/update-python
4+
5+
v1.2.134 (2024-10-23)
6+
-------------------------
7+
* Update deps
8+
* Support django 5.1
9+
* Adjust old migrations to not use index_together
10+
* Use GH actions services for Redis and Postgres
11+
12+
v1.2.133 (2024-09-26)
13+
-------------------------
14+
* Add lock to run the contacts activities squash once
15+
16+
v1.2.132 (2024-09-24)
17+
-------------------------
18+
* Squash contacts activities counts every 15min
19+
* Run code checks
20+
* Translate locale/en/LC_MESSAGES/django.po in cs
21+
22+
v1.2.131 (2024-09-18)
23+
-------------------------
24+
* Set the max length for poll result text
25+
* Do not sync empty contacts not having URNs set
26+
27+
v1.2.130 (2024-08-28)
28+
-------------------------
29+
* Merge pull request #1239 from rapidpro/extra-menu
30+
* Use extra menu link config for global site
31+
32+
v1.2.129 (2024-08-28)
33+
-------------------------
34+
* Merge pull request #1236 from rapidpro/extra-menu
35+
* Merge pull request #1238 from rapidpro/add-dominicana
36+
* Fix name
37+
* Add support for extra link on menu
38+
39+
v1.2.128 (2024-08-28)
40+
-------------------------
41+
* Merge pull request #1237 from rapidpro/add-dominicana
42+
* Merge pull request #1235 from rapidpro/fix-index-together-unique-toghether-use
43+
* Add Dominicana link
44+
* Merge pull request #1233 from rapidpro/updates
45+
* Adjust indexes and constraints
46+
* Update deps
47+
* Merge pull request #1231 from rapidpro/update-deps
48+
* Update sentry-sdk
49+
* Update deps
50+
* Reduce size of logo images to load faster on pages
51+
52+
v1.2.127 (2024-07-26)
53+
-------------------------
54+
* Merge pull request #1229 from rapidpro/kazakh-unicef-logo
55+
* Adjust UNICEF logo for Kazakh
56+
* Merge pull request #1228 from rapidpro/update_dash
57+
* Update dash to order admins on org forms
58+
59+
v1.2.126 (2024-07-12)
60+
-------------------------
61+
* Merge pull request #1227 from rapidpro/add-kazakhstan
62+
* Add Kazakhstan
63+
64+
v1.2.125 (2024-07-11)
65+
-------------------------
66+
* Merge pull request #1226 from rapidpro/update-deps
67+
* Update JS deps
68+
* Merge pull request #1225 from rapidpro/update-deps
69+
* Run code checks
70+
* Update deps
71+
72+
v1.2.124 (2024-07-09)
73+
-------------------------
74+
* Merge pull request #1223 from rapidpro/kaz-updates
75+
* Fix type for Macedonia
76+
* Update KK translations
77+
78+
v1.2.123 (2024-07-02)
79+
-------------------------
80+
* Merge pull request #1222 from rapidpro/use-py-3.11
81+
82+
v1.2.119 (2024-06-28)
83+
-------------------------
84+
* Merge pull request #1220 from rapidpro/GA4
85+
* Merge pull request #1221 from rapidpro/fix-polls-queries-for-sync
86+
* Make sure polls with inactive category are hidden from the public
87+
* Support GA4 measurement ID
88+
* fix queries for polls used to sync results to always sync polls even if there categories are inactive
89+
90+
v1.2.118 (2024-06-06)
91+
-------------------------
92+
* Merge pull request #1219 from rapidpro/add-kazakh
93+
* Add Kazakh
94+
95+
v1.2.117 (2024-05-29)
96+
-------------------------
97+
* Fix extra spaces typo
98+
99+
v1.2.116 (2024-05-24)
100+
-------------------------
101+
* Merge pull request #1218 from rapidpro/support-IG-deeplinks
102+
* Add config for Instagram deeplink checkbox
103+
104+
v1.2.115 (2024-05-23)
105+
-------------------------
106+
* Merge pull request #1214 from rapidpro/support-IG-deeplinks
107+
* Run poetry lock
108+
* Add Instagram deeplink on join page
109+
* Merge pull request #1212 from rapidpro/update-CI-actions
110+
* Update Github actions to latest versions
111+
112+
v1.2.114 (2024-05-02)
113+
-------------------------
114+
* Merge pull request #1210 from rapidpro/fix-homepage-poll-bg-color-new-brand
115+
116+
v1.2.112 (2024-04-17)
117+
-------------------------
118+
* Merge pull request #1209 from rapidpro/fix-stories-api
119+
* Run code checks
120+
* Fix stories API queryset
121+
* Merge pull request #1208 from rapidpro/update-deps
122+
* Update deps
123+
* Merge pull request #1207 from rapidpro/update-deps
124+
* Update deps
125+
* Merge pull request #1206 from rapidpro/dependabot/pip/gunicorn-22.0.0
126+
* Bump gunicorn from 20.1.0 to 22.0.0
127+
128+
v1.2.111 (2024-04-16)
129+
-------------------------
130+
* Merge pull request #1205 from rapidpro/update-depsss
131+
* Run poetry lock
132+
* Run poetry lock
133+
* Test on Django 5.0.x only
134+
* Merge pull request #1202 from Ilhasoft/fix/check-new-brand-in-rtl-orgs
135+
* Check new brand in RTL organizations
136+
1137
v1.2.110 (2024-04-16)
2138
-------------------------
3139
* Merge pull request #1201 from rapidpro/fix-drf-base-template

‎code_check.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def get_current_msgids():
7777
status("Running black")
7878
cmd("black ureport")
7979
status("Running ruff")
80-
cmd("ruff ureport")
80+
cmd("ruff check ureport")
8181
status("Running isort")
8282
cmd("isort ureport")
8383
status("Updating locale PO files")

‎locale/ar/LC_MESSAGES/django.mo

-55 Bytes
Binary file not shown.

‎locale/ar/LC_MESSAGES/django.po

+22-11
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ msgid ""
1212
msgstr ""
1313
"Project-Id-Version: PACKAGE VERSION\n"
1414
"Report-Msgid-Bugs-To: \n"
15-
"POT-Creation-Date: 2024-01-24 10:03+0000\n"
15+
"POT-Creation-Date: 2024-08-28 18:22+0000\n"
1616
"PO-Revision-Date: 2019-05-15 20:27+0000\n"
1717
"Last-Translator: Abraham Okiror <[email protected]>, 2019\n"
1818
"Language-Team: Arabic (https://www.transifex.com/rapidpro/teams/226/ar/)\n"
@@ -692,8 +692,8 @@ msgstr "إدخال"
692692
msgid "Form"
693693
msgstr "نموذج"
694694

695-
msgid "Save Changes"
696-
msgstr "حفظ التغييرات"
695+
msgid "Save"
696+
msgstr ""
697697

698698
#, python-format
699699
msgid "Your new %s has been created."
@@ -1144,11 +1144,6 @@ msgstr ""
11441144
msgid "Want to tell the world about this? Download this image to easily share on social media or for a beautiful presentation!"
11451145
msgstr ""
11461146

1147-
#, fuzzy
1148-
#| msgid "Create"
1149-
msgid "Co-Create"
1150-
msgstr "إنشاء "
1151-
11521147
msgid "SELECT LANGUAGE"
11531148
msgstr ""
11541149

@@ -1856,6 +1851,14 @@ msgstr "النص القصير المستخدم لتوجيه الزائرين ل
18561851
msgid "The call to action text to join on the top section on U-Report"
18571852
msgstr ""
18581853

1854+
msgid "A short text for the extra menu."
1855+
msgstr ""
1856+
1857+
#, fuzzy
1858+
#| msgid "The location for this response"
1859+
msgid "The link for the extra menu."
1860+
msgstr "الموقع الجغرافي الذي أتى منه هذا الرد "
1861+
18591862
msgid "The YouTube video ID for how to join U-Report section"
18601863
msgstr ""
18611864

@@ -1936,6 +1939,11 @@ msgstr ""
19361939
msgid "The Instagram username for this organization"
19371940
msgstr "اسم حساب الإنستغرام الخاص بهذه المؤسسة"
19381941

1942+
#, fuzzy
1943+
#| msgid "The Instagram username for this organization"
1944+
msgid "The Instagram username should be shown on the join page as deeplink for this organization"
1945+
msgstr "اسم حساب الإنستغرام الخاص بهذه المؤسسة"
1946+
19391947
msgid "The Instagram widget id from lightwidget.com"
19401948
msgstr "هوية تطبيق انستغرام المصغر من lightwidget.com"
19411949

@@ -2062,9 +2070,12 @@ msgid "West and Central Africa"
20622070
msgstr ""
20632071

20642072
#, fuzzy
2065-
#~| msgid "U-Report"
2066-
#~ msgid "Ureport API"
2067-
#~ msgstr "يو-ريبورت"
2073+
#~| msgid "Create"
2074+
#~ msgid "Co-Create"
2075+
#~ msgstr "إنشاء "
2076+
2077+
#~ msgid "Save Changes"
2078+
#~ msgstr "حفظ التغييرات"
20682079

20692080
#, fuzzy
20702081
#~| msgid "The title for this item"

‎locale/bg/LC_MESSAGES/django.mo

-85 Bytes
Binary file not shown.

‎locale/bg/LC_MESSAGES/django.po

+24-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ msgid ""
1212
msgstr ""
1313
"Project-Id-Version: PACKAGE VERSION\n"
1414
"Report-Msgid-Bugs-To: \n"
15-
"POT-Creation-Date: 2024-01-24 10:03+0000\n"
15+
"POT-Creation-Date: 2024-08-28 18:22+0000\n"
1616
"PO-Revision-Date: 2019-05-15 20:27+0000\n"
1717
"Last-Translator: Stanislav Dodov <[email protected]>, 2020\n"
1818
"Language-Team: Bulgarian (https://www.transifex.com/rapidpro/teams/226/bg/)\n"
@@ -693,8 +693,8 @@ msgstr "Предай"
693693
msgid "Form"
694694
msgstr "От"
695695

696-
msgid "Save Changes"
697-
msgstr "Запази промените"
696+
msgid "Save"
697+
msgstr ""
698698

699699
#, python-format
700700
msgid "Your new %s has been created."
@@ -1136,11 +1136,6 @@ msgstr "Експортирай и сподели"
11361136
msgid "Want to tell the world about this? Download this image to easily share on social media or for a beautiful presentation!"
11371137
msgstr "Искаш ли светът да узнае за това? Изтегли го като изображение, за да го споделиш в социалните мрежи или за да го приложиш в страхотна презентация!"
11381138

1139-
#, fuzzy
1140-
#| msgid "Create"
1141-
msgid "Co-Create"
1142-
msgstr "Създай"
1143-
11441139
msgid "SELECT LANGUAGE"
11451140
msgstr ""
11461141

@@ -1876,6 +1871,14 @@ msgstr "Краткият текст, който насочва посетите
18761871
msgid "The call to action text to join on the top section on U-Report"
18771872
msgstr "Заглавието на секцията със снимки на началната страница на U-Report "
18781873

1874+
msgid "A short text for the extra menu."
1875+
msgstr ""
1876+
1877+
#, fuzzy
1878+
#| msgid "The location for this response"
1879+
msgid "The link for the extra menu."
1880+
msgstr "Местоположението, от където идва този отговор "
1881+
18791882
msgid "The YouTube video ID for how to join U-Report section"
18801883
msgstr "Идентификация на YouTube клипа за това как да се присъедините към U-Report"
18811884

@@ -1956,6 +1959,11 @@ msgstr "Идентификация на Facebook Pixel за тази орган
19561959
msgid "The Instagram username for this organization"
19571960
msgstr "Потребителското име в Instagram за тази организация"
19581961

1962+
#, fuzzy
1963+
#| msgid "The Instagram username for this organization"
1964+
msgid "The Instagram username should be shown on the join page as deeplink for this organization"
1965+
msgstr "Потребителското име в Instagram за тази организация"
1966+
19591967
msgid "The Instagram widget id from lightwidget.com"
19601968
msgstr "Instagram етикет за приложение от lightwidget.com"
19611969

@@ -2081,6 +2089,14 @@ msgstr ""
20812089
msgid "West and Central Africa"
20822090
msgstr ""
20832091

2092+
#, fuzzy
2093+
#~| msgid "Create"
2094+
#~ msgid "Co-Create"
2095+
#~ msgstr "Създай"
2096+
2097+
#~ msgid "Save Changes"
2098+
#~ msgstr "Запази промените"
2099+
20842100
#~ msgid "Photos"
20852101
#~ msgstr "Снимки"
20862102

‎locale/bn/LC_MESSAGES/django.mo

-102 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)