summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/g2_import/helpers/g2_import.php3
-rw-r--r--modules/gallery/helpers/gallery_task.php3
-rw-r--r--modules/gallery/helpers/graphics.php6
-rw-r--r--modules/gallery/libraries/IdentityProvider.php6
-rw-r--r--modules/organize/helpers/organize_event.php3
-rw-r--r--modules/organize/helpers/organize_installer.php3
-rw-r--r--modules/organize/views/organize_dialog.html.php3
-rw-r--r--modules/slideshow/helpers/slideshow_event.php3
8 files changed, 10 insertions, 20 deletions
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index f2e9dad9..3753c5f2 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -689,8 +689,7 @@ class g2_import_Core {
$title = $g2_item->getTitle();
$title or $title = $g2_item->getPathComponent();
$messages[] =
- t("<a href=\"%g2_url\">%title</a> from Gallery 2 could not be processed; " .
- "(imported as <a href=\"%g3_url\">%title</a>)",
+ t("<a href=\"%g2_url\">%title</a> from Gallery 2 could not be processed; (imported as <a href=\"%g3_url\">%title</a>)",
array("g2_url" => $g2_item_url,
"g3_url" => $item->url(),
"title" => $title));
diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index 6a1fc28a..0886aad0 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -58,8 +58,7 @@ class gallery_task_Core {
$tasks[] = Task_Definition::factory()
->callback("gallery_task::fix")
->name(t("Fix your Gallery"))
- ->description(t("Fix a variety of problems that might cause your Gallery to act " .
- "strangely. Requires maintenance mode."))
+ ->description(t("Fix a variety of problems that might cause your Gallery to act strangely. Requires maintenance mode."))
->severity(log::SUCCESS);
return $tasks;
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index cc4d2e76..bb085ea5 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -338,8 +338,7 @@ class graphics_Core {
} else {
$toolkits->imagemagick->installed = false;
$toolkits->imagemagick->error =
- t("ImageMagick is installed, but PHP's open_basedir restriction " .
- "prevents Gallery from using it.");
+ t("ImageMagick is installed, but PHP's open_basedir restriction prevents Gallery from using it.");
}
} else {
$toolkits->imagemagick->installed = false;
@@ -363,8 +362,7 @@ class graphics_Core {
} else {
$toolkits->graphicsmagick->installed = false;
$toolkits->graphicsmagick->error =
- t("GraphicsMagick is installed, but PHP's open_basedir restriction " .
- "prevents Gallery from using it.");
+ t("GraphicsMagick is installed, but PHP's open_basedir restriction prevents Gallery from using it.");
}
} else {
$toolkits->graphicsmagick->installed = false;
diff --git a/modules/gallery/libraries/IdentityProvider.php b/modules/gallery/libraries/IdentityProvider.php
index 5f341c90..4ef07e1a 100644
--- a/modules/gallery/libraries/IdentityProvider.php
+++ b/modules/gallery/libraries/IdentityProvider.php
@@ -61,8 +61,7 @@ class IdentityProvider_Core {
* Return a commen confirmation message
*/
static function confirmation_message() {
- return t("Are you sure you want to change your Identity Provider? " .
- "Continuing will delete all existing users.");
+ return t("Are you sure you want to change your Identity Provider? Continuing will delete all existing users.");
}
static function change_provider($new_provider) {
@@ -113,8 +112,7 @@ class IdentityProvider_Core {
}
message::error(
- t("Error attempting to enable \"%new_provider\" identity provider, " .
- "reverted to \"%old_provider\" identity provider",
+ t("Error attempting to enable \"%new_provider\" identity provider, reverted to \"%old_provider\" identity provider",
array("new_provider" => $new_provider, "old_provider" => $current_provider)));
$restore_already_running = false;
diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index 1593d30e..2f997600 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -61,8 +61,7 @@ class organize_event_Core {
static function module_change($changes) {
if (!module::is_active("rest") || in_array("rest", $changes->deactivate)) {
site_status::warning(
- t("The Organize module requires the Rest module. " .
- "<a href=\"%url\">Activate the Rest module now</a>",
+ t("The Organize module requires the Rest module. <a href=\"%url\">Activate the Rest module now</a>",
array("url" => html::mark_clean(url::site("admin/modules")))),
"organize_needs_rest");
} else {
diff --git a/modules/organize/helpers/organize_installer.php b/modules/organize/helpers/organize_installer.php
index 12d8147f..2faa598b 100644
--- a/modules/organize/helpers/organize_installer.php
+++ b/modules/organize/helpers/organize_installer.php
@@ -30,8 +30,7 @@ class organize_installer {
if ($version == 1) {
if (!module::is_active("rest")) {
site_status::warning(
- t("The Organize module requires the Rest module. " .
- "<a href=\"%url\">Activate the Rest module now</a>",
+ t("The Organize module requires the Rest module. <a href=\"%url\">Activate the Rest module now</a>",
array("url" => html::mark_clean(url::site("admin/modules")))),
"organize_needs_rest");
}
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index 83143f97..cafc4418 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -130,8 +130,7 @@
<h1 style="display:none"><?= t("Organize :: %name", array("name" => html::purify($album->title))) ?></h1>
<div id="flashContent">
<p>
- <?= t("To use the Organize feature, please ensure that Adobe Flash Player version %flash_minimum_version " .
- "or greater is installed.", array("flash_minimum_version" => $flash_minimum_version)) ?>
+ <?= t("To use the Organize feature, please ensure that Adobe Flash Player version %flash_minimum_version or greater is installed.", array("flash_minimum_version" => $flash_minimum_version)) ?>
</p>
<a href="http://www.adobe.com/go/getflashplayer">
<img src="<?= request::protocol() ?>://www.adobe.com/images/shared/download_buttons/get_flash_player.gif"
diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php
index 6cb5d019..167fa7ff 100644
--- a/modules/slideshow/helpers/slideshow_event.php
+++ b/modules/slideshow/helpers/slideshow_event.php
@@ -27,8 +27,7 @@ class slideshow_event_Core {
static function module_change($changes) {
if (!module::is_active("rss") || in_array("rss", $changes->deactivate)) {
site_status::warning(
- t("The Slideshow module requires the RSS module. " .
- "<a href=\"%url\">Activate the RSS module now</a>",
+ t("The Slideshow module requires the RSS module. <a href=\"%url\">Activate the RSS module now</a>",
array("url" => html::mark_clean(url::site("admin/modules")))),
"slideshow_needs_rss");
} else {