Update libraries. Add uk language option

qlands · qlands · commit 8e366b20c88e · 2023-07-29T20:30:18.000-04:00
diff --git a/alembic/versions/221d9f82a10d_new_field_for_user_email.py b/alembic/versions/221d9f82a10d_new_field_for_user_email.py
@@ -20,7 +20,6 @@
 
 
 def upgrade():
-
     new_mapping = {
         "properties": {
             "user_email": {"type": "text", "copy_to": ["all_data", "user_email2"]},
diff --git a/alembic/versions/4f59ec12363e_analyze_user_email.py b/alembic/versions/4f59ec12363e_analyze_user_email.py
@@ -20,7 +20,6 @@
 
 
 def upgrade():
-
     email_analyzer = {
         "settings": {
             "analysis": {
diff --git a/formshare/config/celery_class.py b/formshare/config/celery_class.py
@@ -139,7 +139,6 @@ def on_success(self, retval, task_id, args, kwargs):
         }
         connection = engine.connect()
         try:
-
             connection.execute(
                 "INSERT INTO finishedtask(task_id,task_enumber) VALUES ('{}',{})".format(
                     str(task_id), 0
diff --git a/formshare/processes/odk/api.py b/formshare/processes/odk/api.py
@@ -4177,7 +4177,6 @@ def push_revision(
     p = Popen(args, stdout=PIPE, stderr=PIPE)
     stdout, stderr = p.communicate()
     if p.returncode == 0:
-
         # Add the JSON to the Elastic Search index
         index_data = {
             "_submitted_date": submission_data.get("_submitted_date", ""),
diff --git a/formshare/products/export/csv/celery_task.py b/formshare/products/export/csv/celery_task.py
@@ -98,7 +98,6 @@ def internal_build_csv(
     p = Popen(args, stdout=PIPE, stderr=PIPE)
     stdout, stderr = p.communicate()
     if p.returncode == 0:
-
         paths = ["*.json"]
         out_path2 = os.path.join(out_path, *paths)
         files = glob.glob(out_path2)
diff --git a/formshare/products/export/media/celery_task.py b/formshare/products/export/media/celery_task.py
@@ -35,7 +35,6 @@ def internal_build_media_zip(
     task_id,
     task_object=None,
 ):
-
     parts = __file__.split("/products/")
     this_file_path = parts[0] + "/locale"
     es = gettext.translation("formshare", localedir=this_file_path, languages=[locale])
diff --git a/formshare/products/fs1import/fs1import.py b/formshare/products/fs1import/fs1import.py
@@ -17,7 +17,6 @@ def formshare_one_import_json(
     project_of_assistant,
     ignore_xform_check=False,
 ):
-
     settings = {}
     for key, value in request.registry.settings.items():
         if isinstance(value, str):
diff --git a/formshare/templates/assistant/snippets/header.jinja2 b/formshare/templates/assistant/snippets/header.jinja2
@@ -80,6 +80,7 @@
                                         <option id="es" value="es">Español</option>
                                         <option id="fr" value="fr">Français</option>
                                         <option id="pt" value="pt">Português</option>
+                                        <option id="uk" value="uk">українська (DeepL)</option>
                                     {% endblock language_options %}
                                 </select>
                             </div>
diff --git a/formshare/templates/dashboard/snippets/header.jinja2 b/formshare/templates/dashboard/snippets/header.jinja2
@@ -59,6 +59,7 @@
                                     <option id="es" value="es">Español</option>
                                     <option id="fr" value="fr">Français</option>
                                     <option id="pt" value="pt">Português</option>
+                                    <option id="uk" value="uk">українська (DeepL)</option>
                                 {% endblock language_options %}
                             </select>
                         </div>
diff --git a/formshare/templates/generic/assistant_login.jinja2 b/formshare/templates/generic/assistant_login.jinja2
@@ -17,6 +17,7 @@
                     <option id="es" value="es">Español</option>
                     <option id="fr" value="fr">Français</option>
                     <option id="pt" value="pt">Português</option>
+                    <option id="uk" value="uk">українська (DeepL)</option>
                 {% endblock language_options %}
             </select>
         </div>
diff --git a/formshare/templates/landing/snippets/header.jinja2 b/formshare/templates/landing/snippets/header.jinja2
@@ -91,6 +91,7 @@
                                         <option id="es" value="es">Español</option>
                                         <option id="fr" value="fr">Français</option>
                                         <option id="pt" value="pt">Português</option>
+                                        <option id="uk" value="uk">українська (DeepL)</option>
                                     {% endblock language_options %}
                                 </select>
                             </div>
diff --git a/formshare/templates/partner/snippets/header.jinja2 b/formshare/templates/partner/snippets/header.jinja2
@@ -74,6 +74,7 @@
                                         <option id="es" value="es">Español</option>
                                         <option id="fr" value="fr">Français</option>
                                         <option id="pt" value="pt">Português</option>
+                                        <option id="uk" value="uk">українська (DeepL)</option>
                                     {% endblock language_options %}
                                 </select>
                             </div>
diff --git a/formshare/views/assistant_views/clean.py b/formshare/views/assistant_views/clean.py
@@ -21,7 +21,6 @@ def __init__(self, request):
         self.checkCrossPost = False
 
     def process_view(self):
-
         form_id = self.request.matchdict["formid"]
 
         if "table" in self.request.params.keys():
@@ -222,7 +221,6 @@ def __init__(self, request):
         self.checkCrossPost = False
 
     def process_view(self):
-
         form_id = self.request.matchdict["formid"]
 
         table_name = self.request.matchdict["tablename"]
diff --git a/formshare/views/assistant_views/jsonlogs.py b/formshare/views/assistant_views/jsonlogs.py
@@ -771,7 +771,6 @@ def process_view(self):
             form_data = get_form_data(self.request, self.projectID, form_id)
             if data is not None:
                 if data["status"] == 4:
-
                     if self.request.method == "POST":
                         post_data = self.get_post_dict()
                         notes = post_data["notes"]
diff --git a/formshare/views/form.py b/formshare/views/form.py
@@ -4012,7 +4012,6 @@ def process_view(self):
             partner_data = self.get_post_dict()
             if "partner_id" in partner_data.keys():
                 if partner_data["partner_id"] != "":
-
                     if "time_bound" in partner_data.keys():
                         partner_data["time_bound"] = True
                     else:
diff --git a/formshare/views/partners.py b/formshare/views/partners.py
@@ -313,7 +313,6 @@ def process_view(self):
 
             partner_data = self.get_post_dict()
             if "modify" in partner_data.keys():
-
                 if partner_data["partner_organization"] == "":
                     self.append_to_errors(self._("The organization cannot be empty"))
                     return {
@@ -519,7 +518,10 @@ def process_view(self):
             continue_delete = True
             for plugin in p.PluginImplementations(p.IPartner):
                 if continue_delete:
-                    (continue_delete, error_message,) = plugin.before_deleting_partner(
+                    (
+                        continue_delete,
+                        error_message,
+                    ) = plugin.before_deleting_partner(
                         self.request, partner_to_delete, partner_details
                     )
                     if not continue_delete:
diff --git a/formshare/views/repository_merge.py b/formshare/views/repository_merge.py
@@ -268,7 +268,6 @@ def process_view(self):
                     s_values_to_ignore,
                 )
                 if merged == 0:
-
                     task_id = merge_form(
                         self.request,
                         project_details["owner"],
diff --git a/requirements.txt b/requirements.txt

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,6 @@ def on_success(self, retval, task_id, args, kwargs):`
`139`	`139`	`}`
`140`	`140`	`connection = engine.connect()`
`141`	`141`	`try:`
`142`		`-`
`143`	`142`	`connection.execute(`
`144`	`143`	`"INSERT INTO finishedtask(task_id,task_enumber) VALUES ('{}',{})".format(`
`145`	`144`	`str(task_id), 0`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,6 @@ def process_view(self):`
`268`	`268`	`s_values_to_ignore,`
`269`	`269`	`)`
`270`	`270`	`if merged == 0:`
`271`		`-`
`272`	`271`	`task_id = merge_form(`
`273`	`272`	`self.request,`
`274`	`273`	`project_details["owner"],`