Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix unstranlated strings #67

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ jobs:
- name: Git Checkout
uses: actions/checkout@v2

- name: Install ruby-devel package
run: zypper --non-interactive install ruby-devel

- name: Install project dependencies
run: bundle install

Expand Down
6 changes: 6 additions & 0 deletions package/yast2-rmt.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 3 11:52:35 UTC 2025 - Luis Caparroz <[email protected]>

- Mark strings on UI dialogs for tranlation (bsc#1127676).
- Version 1.3.6

-------------------------------------------------------------------
Thu Feb 8 16:10:29 UTC 2024 - Luis Caparroz <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-rmt.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-rmt
Version: 1.3.5
Version: 1.3.6
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Expand Down
2 changes: 1 addition & 1 deletion src/lib/rmt.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
# you may find current contact information at www.suse.com

module RMT
VERSION = '1.3.5'.freeze
VERSION = '1.3.6'.freeze
end
7 changes: 4 additions & 3 deletions src/lib/rmt/maria_db/current_root_password_dialog.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ module RMT::MariaDB; end

class RMT::MariaDB::CurrentRootPasswordDialog < RMT::Shared::InputPasswordDialog
def initialize
textdomain 'rmt'
super

@dialog_heading = N_('Database root password is required')
@dialog_label = N_('In order to setup RMT, database access is required. Please provide the current database root password.')
@password_field_label = N_('MariaDB root &password')
@dialog_heading = _('Database root password is required')
@dialog_label = _('In order to setup RMT, database access is required. Please provide the current database root password.')
@password_field_label = _('MariaDB root &password')
end

private
Expand Down
7 changes: 4 additions & 3 deletions src/lib/rmt/maria_db/new_root_password_dialog.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ module RMT::MariaDB; end

class RMT::MariaDB::NewRootPasswordDialog < RMT::Shared::SetPasswordDialog
def initialize
textdomain 'rmt'
super

@dialog_heading = N_('Setting database root password')
@dialog_label = N_('The current MariaDB root password is empty. Setting a root password is required for security reasons.')
@password_field_label = N_('New MariaDB root &Password')
@dialog_heading = _('Setting database root password')
@dialog_label = _('The current MariaDB root password is empty. Setting a root password is required for security reasons.')
@password_field_label = _('New MariaDB root &Password')
end

def set_root_password(new_root_password, hostname)
Expand Down
6 changes: 3 additions & 3 deletions src/lib/rmt/shared/input_password_dialog.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ def ok_handler
def dialog_content
VBox(
VSpacing(1),
Heading(_(@dialog_heading)),
Heading(@dialog_heading),
VSpacing(1),
HBox(
HSpacing(2),
VBox(
Label(_(@dialog_label)),
Label(@dialog_label),
VSpacing(1),
MinWidth(15, Password(Id(:password), _(@password_field_label)))
MinWidth(15, Password(Id(:password), @password_field_label))
),
HSpacing(2)
),
Expand Down
14 changes: 5 additions & 9 deletions src/lib/rmt/shared/set_password_dialog.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module RMT::Shared; end
class RMT::Shared::SetPasswordDialog < UI::Dialog
def initialize
@min_password_size = 0
@password_confirmation_field_label = N_('C&onfirm Password')
@password_confirmation_field_label = _('C&onfirm Password')
textdomain 'rmt'
end

Expand Down Expand Up @@ -60,19 +60,15 @@ def ok_handler
def dialog_content
VBox(
VSpacing(1),
Heading(_(@dialog_heading)),
Heading(@dialog_heading),
VSpacing(1),
HBox(
HSpacing(2),
VBox(
Label(
_(
@dialog_label
)
),
Label(@dialog_label),
VSpacing(1),
MinWidth(15, Password(Id(:password), _(@password_field_label))),
MinWidth(15, Password(Id(:password_confirmation), _(@password_confirmation_field_label)))
MinWidth(15, Password(Id(:password), @password_field_label)),
MinWidth(15, Password(Id(:password_confirmation), @password_confirmation_field_label))
),
HSpacing(2)
),
Expand Down
7 changes: 4 additions & 3 deletions src/lib/rmt/ssl/current_ca_password_dialog.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ module RMT::SSL; end

class RMT::SSL::CurrentCaPasswordDialog < RMT::Shared::InputPasswordDialog
def initialize
textdomain 'rmt'
super

@dialog_heading = N_('Your CA private key is encrypted.')
@dialog_label = N_('Please input password.')
@password_field_label = N_('&Password')
@dialog_heading = _('Your CA private key is encrypted.')
@dialog_label = _('Please input password.')
@password_field_label = _('&Password')
@cert_generator = RMT::SSL::CertificateGenerator.new
end

Expand Down
7 changes: 4 additions & 3 deletions src/lib/rmt/ssl/new_ca_password_dialog.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ module RMT::SSL; end

class RMT::SSL::NewCaPasswordDialog < RMT::Shared::SetPasswordDialog
def initialize
textdomain 'rmt'
super

@dialog_heading = N_('Setting CA private key password')
@dialog_label = N_('Please set a password for the CA private key.')
@password_field_label = N_('&Password')
@dialog_heading = _('Setting CA private key password')
@dialog_label = _('Please set a password for the CA private key.')
@password_field_label = _('&Password')
@min_password_size = 4
end
end