add services-dinit

Otherwise starting in one language will never change the
formatting of percentages when the language changes
later (example: Turkish writes %30, while Dutch writes 30%).

FIXES #2258

CHANGES-3.3

@@ -8,6 +8,18 @@ changelog -- this log starts with version 3.3.0. See CHANGES-3.2 for
 the history of the 3.2 series (2018-05 - 2022-08).
 
 
+# 3.3.1 (unreleased)
+
+This release contains contributions from (alphabetically by first name):
+ - Nobody yet!
+
+## Core ##
+ - No changes of note.
+
+## Modules ##
+ - No changes of note.
+
+
 # 3.3.0 (2023-12-12)
 
 This release contains contributions from (alphabetically by first name):

CMakeLists.txt

@@ -47,8 +47,8 @@
 
 cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 
-set(CALAMARES_VERSION 3.3.0)
-set(CALAMARES_RELEASE_MODE ON) # Set to ON during a release
+set(CALAMARES_VERSION 3.3.1)
+set(CALAMARES_RELEASE_MODE OFF) # Set to ON during a release
 
 if(CMAKE_SCRIPT_MODE_FILE)
     include(${CMAKE_CURRENT_LIST_DIR}/CMakeModules/ExtendedVersion.cmake)
@@ -513,6 +513,7 @@ if(NOT CALAMARES_RELEASE_MODE)
     list(APPEND CALAMARES_TRANSLATION_LANGUAGES ${_tx_incomplete})
 endif()
 list(SORT CALAMARES_TRANSLATION_LANGUAGES)
+list(REMOVE_DUPLICATES CALAMARES_TRANSLATION_LANGUAGES)
 
 add_subdirectory(lang) # i18n tools
 

ci/deps-opensuse.sh

@@ -43,4 +43,8 @@ zypper --non-interactive in \
 
 # Not actual dependencies, but good to have
 zypper --non-interactive in python311-PyYAML python311-jsonschema
+# vi to edit things inside the docker
+zypper --non-interactive in vim
+# noto so that running Calamares in the docker is readable
+zypper --non-interactive in noto-sans-fonts
 true

src/libcalamares/locale/Tests.cpp

@@ -378,7 +378,7 @@ LocaleTests::testTZLookup()
 
     QVERIFY( zones.find( "America", "New_York" ) );
     QCOMPARE( zones.find( "America", "New_York" )->zone(), QStringLiteral( "New_York" ) );
-    QCOMPARE( zones.find( "America", "New_York" )->tr(), QStringLiteral( "New York" ) );
+    QCOMPARE( zones.find( "America", "New_York" )->translated(), QStringLiteral( "New York" ) );
 
     QVERIFY( !zones.find( "Europe", "New_York" ) );
     QVERIFY( !zones.find( "America", "New York" ) );

src/libcalamares/locale/TimeZone.cpp

@@ -76,7 +76,7 @@ TimeZoneData::TimeZoneData( const QString& region,
 }
 
 QString
-TimeZoneData::tr() const
+TimeZoneData::translated() const
 {
     // NOTE: context name must match what's used in zone-extractor.py
     return QObject::tr( m_human, "tz_names" );
@@ -86,11 +86,11 @@ class RegionData : public TranslatableString
 {
 public:
     using TranslatableString::TranslatableString;
-    QString tr() const override;
+    QString translated() const override;
 };
 
 QString
-RegionData::tr() const
+RegionData::translated() const
 {
     // NOTE: context name must match what's used in zone-extractor.py
     return QObject::tr( m_human, "tz_regions" );
@@ -276,7 +276,7 @@ RegionsModel::data( const QModelIndex& index, int role ) const
     const auto& region = m_private->m_regions[ index.row() ];
     if ( role == NameRole )
     {
-        return region->tr();
+        return region->translated();
     }
     if ( role == KeyRole )
     {
@@ -292,13 +292,13 @@ RegionsModel::roleNames() const
 }
 
 QString
-RegionsModel::tr( const QString& region ) const
+RegionsModel::translated( const QString& region ) const
 {
     for ( const auto* p : m_private->m_regions )
     {
         if ( p->key() == region )
         {
-            return p->tr();
+            return p->translated();
         }
     }
     return region;
@@ -330,7 +330,7 @@ ZonesModel::data( const QModelIndex& index, int role ) const
     switch ( role )
     {
     case NameRole:
-        return zone->tr();
+        return zone->translated();
     case KeyRole:
         return zone->key();
     case RegionRole:

src/libcalamares/locale/TimeZone.h

@@ -48,7 +48,7 @@ class TimeZoneData : public QObject, TranslatableString
 
     Q_PROPERTY( QString region READ region CONSTANT )
     Q_PROPERTY( QString zone READ zone CONSTANT )
-    Q_PROPERTY( QString name READ tr CONSTANT )
+    Q_PROPERTY( QString name READ translated CONSTANT )
     Q_PROPERTY( QString countryCode READ country CONSTANT )
 
 public:
@@ -60,7 +60,7 @@ public:
     TimeZoneData( const TimeZoneData& ) = delete;
     TimeZoneData( TimeZoneData&& ) = delete;
 
-    QString tr() const override;
+    QString translated() const override;
 
     QString region() const { return m_region; }
     QString zone() const { return key(); }
@@ -106,7 +106,7 @@ public Q_SLOTS:
      * Returns @p region unchanged if there is no such region
      * or no translation for the region's name.
      */
-    QString tr( const QString& region ) const;
+    QString translated( const QString& region ) const;
 
 private:
     Private* m_private;

src/libcalamares/locale/TranslatableString.h

@@ -41,7 +41,7 @@ public:
     virtual ~TranslatableString();
 
     /// @brief Give the localized human-readable form
-    virtual QString tr() const = 0;
+    virtual QString translated() const = 0;
     QString key() const { return m_key; }
 
     bool operator==( const TranslatableString& other ) const { return m_key == other.m_key; }

src/libcalamaresui/viewpages/ExecutionViewStep.cpp

@@ -73,7 +73,9 @@ ExecutionViewStep::ExecutionViewStep( QObject* parent )
 {
     m_widget->setObjectName( "slideshow" );
     m_progressBar->setObjectName( "exec-progress" );
-    m_progressBar->setFormat( tr( "%p%", "Progress percentage indicator: %p is where the number 0..100 is placed" ) );
+    CALAMARES_RETRANSLATE(
+        m_progressBar->setFormat( tr( "%p%", "Progress percentage indicator: %p is where the number 0..100 is placed" ) );
+    );
     m_label->setObjectName( "exec-message" );
 
     QVBoxLayout* layout = new QVBoxLayout( m_widget );

src/modules/locale/Config.cpp

@@ -390,7 +390,7 @@ Config::currentTimezoneName() const
 {
     if ( m_currentLocation )
     {
-        return m_regionModel->tr( m_currentLocation->region() ) + '/' + m_currentLocation->tr();
+        return m_regionModel->translated( m_currentLocation->region() ) + '/' + m_currentLocation->translated();
     }
     return QString();
 }

src/modules/locale/timezonewidget/timezonewidget.cpp

@@ -144,7 +144,7 @@ TimeZoneWidget::paintEvent( QPaintEvent* )
 #else
     auto textwidth = [ & ]( const QString& s ) { return fontMetrics.width( s ); };
 #endif
-    const int textWidth = textwidth( m_currentLocation ? m_currentLocation->tr() : QString() );
+    const int textWidth = textwidth( m_currentLocation ? m_currentLocation->translated() : QString() );
     const int textHeight = fontMetrics.height();
 
     QRect rect = QRect( point.x() - textWidth / 2 - 5, point.y() - textHeight - 8, textWidth + 10, textHeight - 2 );
@@ -170,7 +170,7 @@ TimeZoneWidget::paintEvent( QPaintEvent* )
     painter.setBrush( QColor( 40, 40, 40 ) );
     painter.drawRoundedRect( rect, 3, 3 );
     painter.setPen( Qt::white );
-    painter.drawText( rect.x() + 5, rect.bottom() - 4, m_currentLocation ? m_currentLocation->tr() : QString() );
+    painter.drawText( rect.x() + 5, rect.bottom() - 4, m_currentLocation ? m_currentLocation->translated() : QString() );
 #endif
 }
 

src/modules/services-dinit/main.py

@@ -0,0 +1,133 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# === This file is part of Calamares - <https://github.com/calamares> ===
+#
+#   Copyright 2018-2019, Adriaan de Groot <groot@kde.org>
+#   Copyright 2021, Artoo <artoo@artixlinux.org>
+#
+#   Calamares is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   Calamares is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+
+import libcalamares
+
+from libcalamares.utils import target_env_call, warning
+from os.path import exists, join
+
+
+import gettext
+_ = gettext.translation("calamares-python",
+                        localedir=libcalamares.utils.gettext_path(),
+                        languages=libcalamares.utils.gettext_languages(),
+                        fallback=True).gettext
+
+
+def pretty_name():
+    return _("Configure Dinit services")
+
+
+class DinitController:
+    """
+    This is the dinit service controller.
+    All of its state comes from global storage and the job
+    configuration at initialization time.
+    """
+
+    def __init__(self):
+        self.root = libcalamares.globalstorage.value('rootMountPoint')
+
+        # Translate the entries in the config to the actions passed to sv-helper
+        self.services = dict()
+        self.services["enable"] = libcalamares.job.configuration.get('services', [])
+        self.services["disable"] = libcalamares.job.configuration.get('disable', [])
+
+        self.initdDir = libcalamares.job.configuration['initdDir']
+        self.runsvDir = libcalamares.job.configuration['runsvDir']
+
+
+    def make_failure_description(self, state, name):
+        """
+        Returns a generic "could not <foo>" failure message, specialized
+        for the action @p state and the specific service @p name.
+        """
+        if state == "enable":
+            description = _("Cannot enable service {name!s}.")
+        elif state == "disable":
+            description = _("Cannot disable service {name!s}.")
+        else:
+            description = _("Unknown service-action <code>{arg!s}</code> for service {name!s}.")
+
+        return description.format(arg=state, name=name)
+
+
+    def update(self, state):
+        """
+        Process each service listed
+        in services for the given @p state.
+        """
+
+        for svc in self.services.get(state, []):
+            if isinstance(svc, str):
+                name = svc
+                mandatory = False
+            else:
+                name = svc["name"]
+                mandatory = svc.get("mandatory", False)
+
+            service_path = self.root + self.initdDir + "/" + name
+            runlevel_path = self.root + self.runsvDir
+            src = self.initdDir + "/" + name
+            dest = self.runsvDir + "/"
+
+            if state == 'enable':
+                cmd = ["ln", "-sv", src, dest]
+            elif state == 'disable':
+                cmd = ["rm", "-rv", dest]
+
+            if exists(service_path):
+                if exists(runlevel_path):
+                    ec = target_env_call(cmd)
+                    if ec != 0:
+                        warning("Cannot {} service {}".format(state, name))
+                        warning("{} returned error code {!s}".format(cmd, ec))
+                        if mandatory:
+                            title = _("Cannot modify service")
+                            diagnostic = _("<code>cmd {arg!s}</code> call in chroot returned error code {num!s}.").format(arg=state, num=ec)
+                            return (title,
+                                    self.make_failure_description(state, name) + " " + diagnostic
+                                    )
+            else:
+                warning("Target service {} does not exist in {}.".format(name, self.initdDir))
+                if mandatory:
+                    title = _("Target service does not exist")
+                    diagnostic = _("The path for service {name!s} is <code>{path!s}</code>, which does not exist.").format(name=name, path=service_path)
+                    return (title,
+                            self.make_failure_description(state, name) + " " + diagnostic
+                            )
+
+
+    def run(self):
+        """Run the controller
+        """
+
+        for state in ("enable", "disable"):
+            r = self.update(state)
+            if r is not None:
+                return r
+
+def run():
+    """
+    Setup services
+    """
+
+    return DinitController().run()

src/modules/services-dinit/module.desc

@@ -0,0 +1,5 @@
+---
+type:       "job"
+name:       "services-dinit"
+interface:  "python"
+script:     "main.py"

src/modules/services-dinit/services-dinit.conf

@@ -0,0 +1,41 @@
+# runit services module to modify service runlevels via symlinks in the chroot
+#
+# Services can be added (to any runlevel, or multiple runlevels) or deleted.
+# Handle disable with care and only use it if absolutely necessary.
+#
+# if a service is listed in the conf but is not present/detected on the target system,
+# it will be ignored and skipped; a warning is logged.
+#
+---
+# initdDir: holds the runit service directory location
+initdDir: /etc/dinit.d
+
+# runsvDir: holds the runlevels directory location
+runsvDir: /etc/dinit.d/boot.d
+
+# services: a list of entries to **enable**
+# disable: a list of entries to **disable**
+#
+# Each entry has three fields:
+#   - name: the service name
+#   - (optional) mandatory: if set to true, a failure to modify
+#     the service will result in installation failure, rather than just
+#     a warning. The default is false.
+#
+# an entry may also be a single string, which is interpreted
+# as the name field.
+#
+# # Example services and disable settings:
+# # - add foo1, but it must succeed
+# # - add foo2
+# # - remove foo3
+# # - remove foo4
+# services:
+#     - name: foo1
+#       mandatory: true
+#     - name: foo2
+# disable:
+#     - name: foo3
+#     - foo4
+services: []
+disable: []