fix translation issues

enricofer · Sep 1, 2024 · 7aa7460 · 7aa7460
1 parent 5a8f1f0
commit 7aa7460
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/webapp/djakart/admin.py b/webapp/djakart/admin.py
@@ -103,10 +103,10 @@ def wrapper(modeladmin,request,obj,**kwargs):
                         modeladmin.admin_site.each_context(request),
                         parameter = parameter,
                         form =  importForm(estensione = estensione),
-                        title="Importa file"
+                        title="Import file"
                     )
                     return TemplateResponse(request, "admin/action_file.html", context)
-                elif request.POST.get("confirmation") == "importa":
+                elif request.POST.get("confirmation") == "import":
                     kwargs[parameter] = request.GET.get(parameter) 
                     form = importForm(request.POST,request.FILES, estensione = estensione)
                     if form.is_valid() and 'nuovo_dataset' in request.FILES:
@@ -117,7 +117,7 @@ def wrapper(modeladmin,request,obj,**kwargs):
                         context = {
                             "parameter":  parameter,
                             "form": form,
-                            "title": "Importa file"
+                            "title": "Import file"
                         }
                         return TemplateResponse(request, "admin/action_file.html", context)
 
@@ -148,7 +148,7 @@ def wrapper(modeladmin,request,obj,**kwargs):
                         "value": "{} ".format(obj.nome)
                     }
                     return TemplateResponse(request, "admin/action_parameter.html", context)
-                elif request.GET.get("confirmation") == "Commit":
+                elif request.GET.get("confirmation") == "Ok":
                     kwargs[parameter] = request.GET.get(parameter) 
 
                 return func(modeladmin, request,obj, **kwargs)
@@ -452,20 +452,20 @@ def undo(self, request, obj):
             return HttpResponseRedirect("/admin/djakart/version/%s/" % obj.pk)
 
     @action(label="Commit", description="Record edits as a commit")
-    @require_parameter("messaggio_di_registrazione")
+    @require_parameter("Commit message")
     def commit(self, request, obj, **kwargs):
         if obj.pk:
             #print (kwargs["messaggio di registrazione"])
             obj.config_user(request.user.username,request.user.email)
-            obj.commit("{}: {}".format(obj.nome, kwargs["messaggio_di_registrazione"]))
+            obj.commit("{}: {} ".format(obj.nome, kwargs["Commit message"]))
             return HttpResponseRedirect("/admin/djakart/version/%s/" % obj.pk)
 
     @action(label="New sub-version", description="New version from the existing one")
-    @require_parameter("nome_nuova_versione")
+    @require_parameter("New version name")
     def nuova_versione_da_esistente(self, request, obj, **kwargs):
         if obj.pk:
             nuova_versione = version()
-            nuova_versione.nome = kwargs["nome_nuova_versione"]
+            nuova_versione.nome = kwargs["New version name"]
             nuova_versione.base = obj
             nuova_versione.crs = obj.crs
             nuova_versione.save()

diff --git a/webapp/djakart/templates/admin/action_confirmation.html b/webapp/djakart/templates/admin/action_confirmation.html
@@ -5,7 +5,7 @@
   delete-selected-confirmation{% endblock %}
 
 {% block content %}
-  <p>Sei sicuro di voler effettuare l'operazione di {{ action }}?</p>
+  <p>Really want to perform action {{ action }}?</p>
   <ul style="padding: 0">
     {% for object in queryset.all %}
       <li style="list-style: none; float: left; margin: 5px">
@@ -23,8 +23,8 @@
     </fieldset>
     <div class="submit-row">
       <input type="hidden" name="action" value="{{ action }}"/>
-      <input type="submit" name="confirmation" value="Conferma"/>
-      <input type="submit" name="back" value="No, torna indietro" onclick="window.history.back(); return false;"/>
+      <input type="submit" name="confirmation" value="Ok"/>
+      <input type="submit" name="back" value="No, go back" onclick="window.history.back(); return false;"/>
     </div>
   </form>
 {% endblock %}
diff --git a/webapp/djakart/templates/admin/action_file.html b/webapp/djakart/templates/admin/action_file.html
@@ -20,8 +20,8 @@
 
     <div class="submit-row" style="display:flex!important;align-items: center;">
       {{ form }}
-      <input style="margin:2px;" id="importa" type="submit" name="confirmation" value="importa"/>
-      <input style="margin:2px;" type="submit" name="back" value="No, torna indietro" onclick="window.history.back(); return false;"/>
+      <input style="margin:2px;" id="importa" type="submit" name="confirmation" value="import"/>
+      <input style="margin:2px;" type="submit" name="back" value="No, go back" onclick="window.history.back(); return false;"/>
     </div>
   </form>
 {% endblock %}
diff --git a/webapp/djakart/templates/admin/action_parameter.html b/webapp/djakart/templates/admin/action_parameter.html
@@ -33,8 +33,8 @@
     <div class="submit-row" style="display:flex!important;align-items: center;">
       <label style="margin:2px;font-size:1.2em;align-items: center;" for="{{ parameter }}">{{ parameter }}: {{ value }}</label>
       <input style="width:400px;margin:2px;" type="text" id="{{ parameter }}" name="{{ parameter }}" value="" oninput="enableCommit()"/>
-      <input style="display:none;margin:2px;" id="commit" type="submit" name="confirmation" value="Commit"/>
-      <input style="margin:2px;" type="submit" name="back" value="No, torna indietro" onclick="window.history.back(); return false;"/>
+      <input style="display:none;margin:2px;" id="commit" type="submit" name="confirmation" value="Ok"/>
+      <input style="margin:2px;" type="submit" name="back" value="No, go back" onclick="window.history.back(); return false;"/>
     </div>
   </form>
 {% endblock %}