11085 bilingual file upload

docs/changes.rst

@@ -22,6 +22,7 @@ Not yet released.
 * :kbd:`?` now displays available :ref:`keyboard`.
 * Translation and language view in the project now include basic information about the language and plurals.
 * :ref:`bulk-edit` shows a preview of matched strings.
+* Creating component via file upload (Translate document) now supports bilingual files.
 
 **Bug fixes**
 

weblate/trans/forms.py

@@ -1850,6 +1850,13 @@ class ComponentDocCreateForm(ComponentProjectForm):
         validators=[validate_file_extension],
     )
 
+    target_language = forms.ModelChoiceField(
+        widget=SortedSelect,
+        label=gettext_lazy("Target language"),
+        help_text=gettext_lazy("Target language of the document for bilingual files"),
+        queryset=Language.objects.all(),
+        required=False,
+    )
     field_order = ["docfile", "project", "name", "slug"]
 
     def __init__(self, *args, **kwargs) -> None:

weblate/trans/tests/test_create.py

@@ -8,13 +8,14 @@
 from django.test.utils import modify_settings, override_settings
 from django.urls import reverse
 
-from weblate.lang.models import get_default_lang
+from weblate.lang.models import Language, get_default_lang
 from weblate.trans.tests.test_views import ViewTestCase
 from weblate.trans.tests.utils import create_test_billing, get_test_file
 from weblate.vcs.git import GitRepository
 
 TEST_ZIP = get_test_file("translations.zip")
 TEST_HTML = get_test_file("cs.html")
+TEST_PO = get_test_file("cs.po")
 
 
 class CreateTest(ViewTestCase):
@@ -370,6 +371,26 @@ def test_create_doc_category(self) -> None:
         self.assertContains(response, "Adding new translation")
         self.assertContains(response, "*.html")
 
+    @modify_settings(INSTALLED_APPS={"remove": "weblate.billing"})
+    def test_create_doc_bilingual(self) -> None:
+        self.user.is_superuser = True
+        self.user.save()
+
+        with open(TEST_PO) as handle, override_settings(CREATE_GLOSSARIES=False):
+            response = self.client.post(
+                reverse("create-component-doc"),
+                {
+                    "docfile": handle,
+                    "name": "Bilingual Component From Doc",
+                    "slug": "bilingual-component-from-doc",
+                    "project": self.project.pk,
+                    "source_language": get_default_lang(),
+                    "target_language": Language.objects.get(code="cs").id,
+                },
+            )
+        self.assertContains(response, "Choose translation files to import")
+        self.assertNotContains(response, "gettext PO file (monolingual)")
+
     @modify_settings(INSTALLED_APPS={"remove": "weblate.billing"})
     def test_create_scratch(self) -> None:
         @override_settings(CREATE_GLOSSARIES=self.CREATE_GLOSSARIES)

weblate/trans/views/create.py

@@ -415,9 +415,10 @@ def form_valid(self, form):
             return super().form_valid(form)
 
         fake = create_component_from_doc(
-            form.cleaned_data, form.cleaned_data.pop("docfile")
+            form.cleaned_data,
+            form.cleaned_data.pop("docfile"),
+            form.cleaned_data.pop("target_language", None),
         )
-
         # Move to discover phase
         self.stage = "discover"
         self.initial = form.cleaned_data

weblate/utils/views.py

@@ -149,7 +149,7 @@
     if sort_by:
         object_list, sort_by = sort_objects(object_list, sort_by)
     paginator = Paginator(object_list, limit)
     paginator.sort_by = sort_by
     try:
         return paginator.page(page)
     except EmptyPage:
@@ -240,7 +240,7 @@
     # First level is always project
     project = get_object_or_404(Project, slug=path.pop(0))
     if not skip_acl:
         request.user.check_access(project)
     project.acting_user = acting_user
     if not path:
         check_type(Project)
@@ -271,14 +271,14 @@
         with suppress(Component.DoesNotExist):
             current = current.component_set.get(slug=slug, **category_args)
             if not skip_acl:
                 request.user.check_access_component(current)
             current.acting_user = acting_user
             break
 
         # Try category
         with suppress(Category.DoesNotExist):
             current = current.category_set.get(slug=slug, **category_args)
             current.acting_user = acting_user
             category_args = {}
             continue
 
@@ -296,7 +296,7 @@
     if not allowed_types & {Translation, Unit}:
         raise UnsupportedPathObjectError("No remaining supported object type")
 
     translation = get_object_or_404(current.translation_set, language__code=path.pop(0))
     if not path:
         check_type(Translation)
         return translation
@@ -386,26 +386,31 @@
     data["filemask"] = "{}/{}{}".format(data.get("slug", "translations"), "*", ext)
 
 
-def create_component_from_doc(data, docfile):
+def create_component_from_doc(data, docfile, target_language: Language | None = None):
     # Calculate filename
     uploaded = docfile or data["docfile"]
     guess_filemask_from_doc(data, uploaded)
     filemask = data["filemask"]
-    filename = filemask.replace(
-        "*",
-        data["source_language"].code
+    file_language_code = (
+        target_language.code
+        if target_language  # bilingual file
+        else data["source_language"].code
         if "source_language" in data
-        else settings.DEFAULT_LANGUAGE,
+        else settings.DEFAULT_LANGUAGE
     )
+    filename = filemask.replace("*", file_language_code)
     # Create fake component (needed to calculate path)
     fake = Component(
         project=data["project"],
         slug=data["slug"],
         name=data["name"],
         category=data.get("category", None),
-        template=filename,
         filemask=filemask,
     )
+
+    if not target_language:
+        fake.template = filename
+
     # Create repository
     LocalRepository.from_files(fake.full_path, {filename: uploaded.read()})
     return fake
@@ -465,7 +470,7 @@
     extra: dict[str, bytes] | None = None,
 ):
     response = HttpResponse(content_type="application/zip")
     with ZipFile(response, "w", strict_timestamps=False) as zipfile:
         for filename in iter_files(filenames):
             try:
                 zipfile.write(filename, arcname=os.path.relpath(filename, root))
@@ -539,7 +544,7 @@
         else:
             extension = ".zip"
             response = zip_download(
                 translation.get_filename(),
                 filenames,
                 translation.full_slug.replace("/", "-"),
             )
@@ -590,6 +595,6 @@
         show_form_errors(self.request, form)
         return HttpResponseRedirect(self.get_success_url())
 
     def get(self, request: AuthenticatedHttpRequest, *args, **kwargs):
         """There is no GET view here."""
         return HttpResponseRedirect(self.get_success_url())