Merge branch 'main' into prepare-backends

elementary · Oct 1, 2024 · 64ef863 · 64ef863
2 parents 1592f73 + eae9af3
commit 64ef863
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 63 deletions.
diff --git a/po/en_GB.po b/po/en_GB.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-09-11 22:12+0000\n"
-"PO-Revision-Date: 2024-05-28 23:13+0000\n"
+"PO-Revision-Date: 2024-09-29 02:16+0000\n"
 "Last-Translator: David Hewitt <[email protected]>\n"
 "Language-Team: English (United Kingdom) <https://l10n.elementary.io/projects/"
 "installer/installer/en_GB/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.5\n"
+"X-Generator: Weblate 5.6.2\n"
 "X-Launchpad-Export-Date: 2016-09-27 06:42+0000\n"
 
 #: src/Application.vala:44
@@ -167,16 +167,12 @@ msgstr ""
 "An Internet connection is required to install NVIDIA® graphics drivers."
 
 #: src/Views/DriversView.vala:50
-#, fuzzy
-#| msgid ""
-#| "Proprietary drivers can be installed later through AppCenter, but an "
-#| "Internet connection will be required for all drivers."
 msgid ""
 "Proprietary drivers can be installed later through System Settings → System, "
 "but an Internet connection will be required for all drivers."
 msgstr ""
-"Proprietary drivers can be installed later through AppCenter, but an "
-"Internet connection will be required for all drivers."
+"Proprietary drivers can be installed later through System Settings → System, "
+"but an Internet connection will be required for all drivers."
 
 #: src/Views/DriversView.vala:55
 msgid ""
@@ -392,10 +388,8 @@ msgid "Show log"
 msgstr "Show log"
 
 #: src/Views/ProgressView.vala:90
-#, fuzzy
-#| msgid "Before Installing"
 msgid "Installing"
-msgstr "Before Installing"
+msgstr "Installing"
 
 #: src/Views/ProgressView.vala:95
 msgid "Hide log"

diff --git a/po/fa.po b/po/fa.po
@@ -3,16 +3,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-09-11 22:12+0000\n"
-"PO-Revision-Date: 2022-04-14 23:02+0000\n"
-"Last-Translator: Pikhosh <pikhosh@gmail.com>\n"
+"PO-Revision-Date: 2024-09-30 16:16+0000\n"
+"Last-Translator: Hossein <hossein17@duck.com>\n"
 "Language-Team: Persian <https://l10n.elementary.io/projects/installer/"
 "installer/fa/>\n"
 "Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.4.2\n"
+"X-Generator: Weblate 5.6.2\n"
 "X-Launchpad-Export-Date: 2016-09-27 06:41+0000\n"
 
 #: src/Application.vala:44
@@ -22,7 +22,7 @@ msgstr "%s نصب"
 
 #: src/Application.vala:52
 msgid "operating system is being installed"
-msgstr ""
+msgstr "سیستم عامل در حال نصب است"
 
 #: src/MainWindow.vala:265
 msgid "Connect to a Power Source"
@@ -66,20 +66,20 @@ msgid "Cancel Installation"
 msgstr "انصراف از نصب"
 
 #: src/Views/CheckView.vala:50
-#, fuzzy
-#| msgid "Try Installing Again"
 msgid "Before Installing"
-msgstr "مجددا تلاش برای نصب کنید"
+msgstr "قبل از نصب"
 
 #: src/Views/CheckView.vala:57
 msgid "Pre-Release Version"
-msgstr ""
+msgstr "نسخه پیش از انتشار"
 
 #: src/Views/CheckView.vala:58
 msgid ""
 "Only install on devices dedicated for development. <b>You will not be able "
 "to upgrade to a stable release</b>."
 msgstr ""
+"فقط بر روی دستگاه های مخصوص برنامه نویسی نصب کنید. <b>شما نمی توانید به نسخه "
+"پایدار ارتقا دهید</b>."
 
 #: src/Views/CheckView.vala:63
 msgid "Virtual Machine"
@@ -89,20 +89,20 @@ msgstr "ماشین مجازی"
 #, c-format
 msgid "Some parts of %s may run slowly, freeze, or not function properly."
 msgstr ""
+"برخی از بخش‌های %s ممکن است به کندی اجرا شوند، ثابت شوند یا به درستی کار "
+"نکنند."
 
 #: src/Views/CheckView.vala:69
 msgid "Your Device May Be Too Slow"
 msgstr "دستگاه شما شاید خیلی کند است"
 
 #: src/Views/CheckView.vala:70
 msgid "This may cause it to run slowly or freeze."
-msgstr ""
+msgstr "این ممکن است کند کار کند یا هنگ کند."
 
 #: src/Views/CheckView.vala:85
-#, fuzzy
-#| msgid "Install %s"
 msgid "Install Anyway"
-msgstr "%s نصب"
+msgstr "به هر حال نصب کنید"
 
 #: src/Views/CheckView.vala:208
 msgid "Recommended:"
@@ -142,17 +142,18 @@ msgid "Next"
 msgstr "بعدی"
 
 #: src/Views/DriversView.vala:26
-#, fuzzy
-#| msgid "Partitioning Drive"
 msgid "Additional Drivers"
-msgstr "پارتشن بندی درایو"
+msgstr "درایورهای اضافی"
 
 #: src/Views/DriversView.vala:30
 msgid ""
 "Broadcom® Wi-Fi adapters, NVIDIA® graphics, and some virtual machines may "
 "not function properly without additional drivers. Most devices do not "
 "require additional drivers."
 msgstr ""
+"ممکن است آداپتورهای Wi-Fi Broadcom®، گرافیک های NVIDIA® و برخی از ماشین های "
+"مجازی بدون درایورهای اضافی به درستی کار نکنند. اکثر دستگاه ها به درایورهای "
+"اضافی نیاز ندارند."
 
 #: src/Views/DriversView.vala:38
 msgid ""

diff --git a/src/Views/PartitioningView.vala b/src/Views/PartitioningView.vala
@@ -212,8 +212,15 @@ public class Installer.PartitioningView : AbstractInstallerView {
     private DiskBar get_disk_bar (InstallerDaemon.Disk disk, bool lvm) {
         var partitions = new Gee.ArrayList<PartitionBlock> ();
         foreach (unowned InstallerDaemon.Partition part in disk.partitions) {
-            var partition = new PartitionBlock (part, disk.device_path, disk.sector_size, lvm, this.set_mount, this.unset_mount, this.mount_is_set);
-            partition.decrypted.connect (on_partition_decrypted);
+            var partition = new PartitionBlock (part);
+
+            if (part.filesystem == LUKS) {
+                partition.menu = new DecryptMenu (part.device_path);
+                ((DecryptMenu) partition.menu).decrypted.connect (on_partition_decrypted);
+            } else {
+                partition.menu = new PartitionMenu (part.device_path, disk.device_path, part.filesystem, lvm, this.set_mount, this.unset_mount, this.mount_is_set, partition);
+            }
+
             partitions.add (partition);
         }
 

diff --git a/src/Widgets/DiskBar.vala b/src/Widgets/DiskBar.vala
@@ -40,7 +40,7 @@ public class Installer.DiskBar: Gtk.Box {
                 p.partition.device_path,
                 p.get_partition_size () * 512,
                 p.partition.filesystem.to_string (),
-                p.volume_group,
+                p.partition.filesystem == LVM ? p.partition.current_lvm_volume_group : null,
                 p.menu
             );
         }

diff --git a/src/Widgets/PartitionBlock.vala b/src/Widgets/PartitionBlock.vala
@@ -6,55 +6,37 @@
  */
 
 public class Installer.PartitionBlock : Adw.Bin {
-    public signal void decrypted (InstallerDaemon.LuksCredentials credential);
-
     public Icon? icon { get; set; default = null; }
 
-    public bool lvm { get; construct; }
-    public InstallerDaemon.Partition partition { get; construct; }
-    public string parent_path { get; construct; }
+    private Gtk.Popover _menu;
+    public Gtk.Popover menu {
+        get {
+            return _menu;
+        }
 
-    public string? volume_group { get; private set; }
-    public Gtk.Popover menu { get; private set; }
+        set {
+            _menu = value;
+            _menu.set_parent (this);
+            _menu.position = BOTTOM;
 
-    public PartitionBlock (
-        InstallerDaemon.Partition partition,
-        string parent_path,
-        uint64 sector_size,
-        bool lvm,
-        SetMount set_mount,
-        UnsetMount unset_mount,
-        MountSetFn mount_set
-    ) {
-        Object (
-            lvm: lvm,
-            parent_path: parent_path,
-            partition: partition
-        );
+            var click_gesture = new Gtk.GestureClick ();
+            click_gesture.released.connect (_menu.popup);
 
-        if (partition.filesystem == LUKS) {
-            menu = new DecryptMenu (partition.device_path);
-            ((DecryptMenu)menu).decrypted.connect ((creds) => decrypted (creds));
-        } else {
-            menu = new PartitionMenu (partition.device_path, parent_path, partition.filesystem, lvm, set_mount, unset_mount, mount_set, this);
+            add_controller (click_gesture);
         }
+    }
 
-        menu.set_parent (this);
-        menu.position = BOTTOM;
-
-        var click_gesture = new Gtk.GestureClick ();
-        click_gesture.released.connect (menu.popup);
+    public InstallerDaemon.Partition partition { get; construct; }
 
-        add_controller (click_gesture);
+    public PartitionBlock (InstallerDaemon.Partition partition) {
+        Object (partition: partition);
     }
 
     class construct {
         set_css_name ("block");
     }
 
     construct {
-        volume_group = (partition.filesystem == LVM) ? partition.current_lvm_volume_group : null;
-
         var image = new Gtk.Image () {
             halign = END,
             valign = END