summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmdkapplet-add-media-helper6
-rw-r--r--mdkapplet_gui.pm10
-rw-r--r--mdkonline.pm8
3 files changed, 9 insertions, 15 deletions
diff --git a/mdkapplet-add-media-helper b/mdkapplet-add-media-helper
index c8d3c440..ee231692 100755
--- a/mdkapplet-add-media-helper
+++ b/mdkapplet-add-media-helper
@@ -117,8 +117,7 @@ my $title = N("Adding an additional package medium");
}
sub run_authentication_dialog {
- my $description = N("Please fill in your account ID to add an " .
- "additional package medium");
+ my $description = N("Please fill in your account ID to add an additional package medium");
mdkapplet_gui::run_ask_credentials_dialog($title,
$description,
\&authenticate_callback);
@@ -139,8 +138,7 @@ sub authenticate_callback {
elsif (!$product->{has_rights}->($profile)) {
mdkapplet_gui::run_no_rights_dialog(
$title,
- N("Your Mandriva account does not have %s download " .
- "subscription enabled.",
+ N("Your Mandriva account does not have %s download subscription enabled.",
mdkonline::translate_product($up_product)),
$product{$up_product}->{info_url}
);
diff --git a/mdkapplet_gui.pm b/mdkapplet_gui.pm
index 5bfd2144..4e292ee3 100644
--- a/mdkapplet_gui.pm
+++ b/mdkapplet_gui.pm
@@ -236,14 +236,12 @@ sub run_no_rights_dialog {
sub open_ask_powerpack_dialog {
- my $title = N('Would you like Powerpack?');
+ my $title = N("Would you like Powerpack?");
my $w = new_portable_dialog($title);
my @widgets = (
mdkonline::get_banner($title),
gtknew('Label_Left',
- text => N("Since you don't have Powerpack rights " .
- "you may visit mandriva store now and " .
- "get Powerpack subscription."),
+ text => N("Since you don't have Powerpack rights you may visit mandriva store now and get Powerpack subscription."),
@common),
gtknew('HButtonBox',
layout => 'start',
@@ -256,9 +254,7 @@ sub open_ask_powerpack_dialog {
)
]),
gtknew('Label_Left',
- text => N('Continue to use your new Powerpack ' .
- 'account information to upgrade, or ' .
- 'Cancel and upgrade to the Free Edition.'),
+ text => N("Continue to use your new Powerpack account information to upgrade, or Cancel and upgrade to the Free Edition."),
@common),
ugtk2::create_okcancel($w,
N("Continue and Authenticate!"),
diff --git a/mdkonline.pm b/mdkonline.pm
index 6c0659f6..50f9457f 100644
--- a/mdkonline.pm
+++ b/mdkonline.pm
@@ -92,7 +92,7 @@ sub is_it_2008_0() {
}
sub is_extmaint_supported() {
- $product_id->{support} eq 'extended'
+ $product_id->{support} eq 'extended';
}
sub is_enterprise_media_supported() {
@@ -179,7 +179,7 @@ sub translate_product {
powerPack => N("Mandriva PowerPack"),
server => N("Mandriva Enterprise Server"),
);
- $product or $product = lc $product_id->{product};
+ $product ||= lc $product_id->{product};
$strings{$product} || $product;
}
@@ -199,7 +199,7 @@ sub get_urpmi_options() {
sub add_medium_enterprise {
my ($email, $password, $version, $arch) = @_;
- my $uri = sprintf("https://%s:%s\@download.mandriva.com/%s/rpms/%s/",
+ my $uri = sprintf("https://%s:%s@download.mandriva.com/%s/rpms/%s/",
uri_escape($email),
uri_escape($password),
$version,
@@ -210,7 +210,7 @@ sub add_medium_enterprise {
sub add_medium_powerpack {
my ($email, $password, $version, $arch) = @_;
- my $uri = sprintf("https://%s:%s\@dl.mandriva.com/rpm/comm/%s/",
+ my $uri = sprintf("https://%s:%s@dl.mandriva.com/rpm/comm/%s/",
uri_escape($email),
uri_escape($password),
$version);