Select the language packages for installation

agama-project · Nov 24, 2023 · f8a0c70 · f8a0c70
1 parent ea074d0
commit f8a0c70
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/service/lib/agama/software/proposal.rb b/service/lib/agama/software/proposal.rb
@@ -136,8 +136,11 @@ def initialize_target
         Yast::Pkg.TargetFinish # ensure that previous target is closed
         Yast::Pkg.TargetInitialize(Yast::Installation.destdir)
         Yast::Pkg.TargetLoad
-        logger.info "Registering locales #{languages}"
-        Yast::Pkg.SetAdditionalLocales(languages)
+
+        preferred, *additional = languages
+        Yast::Pkg.SetPackageLocale(preferred) if preferred
+        Yast::Pkg.SetAdditionalLocales(additional)
+
         Yast::Pkg.SetSolverFlags("ignoreAlreadyRecommended" => false, "onlyRequires" => false)
       end
 

diff --git a/service/test/agama/software/proposal_test.rb b/service/test/agama/software/proposal_test.rb
@@ -59,8 +59,9 @@
     end
 
     it "selects the language packages" do
+      expect(Yast::Pkg).to receive(:SetPackageLocale).with("cs_CZ")
       expect(Yast::Pkg).to receive(:SetAdditionalLocales).with(["de_DE"])
-      subject.languages = ["de_DE"]
+      subject.languages = ["cs_CZ", "de_DE"]
       subject.calculate
     end