summaryrefslogtreecommitdiff
path: root/modules/gallery
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gallery')
-rw-r--r--modules/gallery/controllers/admin_languages.php2
-rw-r--r--modules/gallery/helpers/gallery_block.php26
-rw-r--r--modules/gallery/helpers/gallery_installer.php4
-rw-r--r--modules/gallery/helpers/gallery_rss.php4
-rw-r--r--modules/gallery/views/admin_advanced_settings.html.php4
-rw-r--r--modules/gallery/views/admin_block_platform.html.php2
-rw-r--r--modules/gallery/views/admin_graphics.html.php6
-rw-r--r--modules/gallery/views/admin_graphics_none.html.php2
-rw-r--r--modules/gallery/views/admin_identity.html.php2
-rw-r--r--modules/gallery/views/admin_languages.html.php4
-rw-r--r--modules/gallery/views/admin_maintenance.html.php12
-rw-r--r--modules/gallery/views/admin_sidebar.html.php6
-rw-r--r--modules/gallery/views/admin_themes.html.php4
-rw-r--r--modules/gallery/views/l10n_client.html.php6
-rw-r--r--modules/gallery/views/login.html.php2
-rw-r--r--modules/gallery/views/login_ajax.html.php4
-rw-r--r--modules/gallery/views/maintenance.html.php4
-rw-r--r--modules/gallery/views/simple_uploader.html.php4
-rw-r--r--modules/gallery/views/upgrader.html.php2
-rw-r--r--modules/gallery/views/welcome_message.html.php4
20 files changed, 52 insertions, 52 deletions
diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index ccc631c7..27537c7f 100644
--- a/modules/gallery/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -115,7 +115,7 @@ class Admin_Languages_Controller extends Admin_Controller {
? t("This is a unique key that will allow you to send translations to the remote
server. To get your API key go to %server-link.",
array("server-link" => html::mark_clean(html::anchor($server_link))))
- : t("API Key"))
+ : t("API key"))
->value($api_key)
->error_messages("invalid", t("The API key you provided is invalid."));
$group->submit("save")->value(t("Save settings"));
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index 6c08d39a..0052affc 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -21,15 +21,15 @@ class gallery_block_Core {
static function get_admin_list() {
return array(
"welcome" => t("Welcome to Gallery 3!"),
- "photo_stream" => t("Photo Stream"),
- "log_entries" => t("Log Entries"),
- "stats" => t("Gallery Stats"),
- "platform_info" => t("Platform Information"),
- "project_news" => t("Gallery Project News"));
+ "photo_stream" => t("Photo stream"),
+ "log_entries" => t("Log entries"),
+ "stats" => t("Gallery stats"),
+ "platform_info" => t("Platform information"),
+ "project_news" => t("Gallery project news"));
}
static function get_site_list() {
- return array("language" => t("Language Preference"));
+ return array("language" => t("Language preference"));
}
static function get($block_id) {
@@ -43,7 +43,7 @@ class gallery_block_Core {
case "photo_stream":
$block->css_id = "g-photo-stream";
- $block->title = t("Photo Stream");
+ $block->title = t("Photo stream");
$block->content = new View("admin_block_photo_stream.html");
$block->content->photos =
ORM::factory("item")->where("type", "photo")->orderby("created", "DESC")->find_all(10);
@@ -51,7 +51,7 @@ class gallery_block_Core {
case "log_entries":
$block->css_id = "g-log-entries";
- $block->title = t("Log Entries");
+ $block->title = t("Log entries");
$block->content = new View("admin_block_log_entries.html");
$block->content->entries = ORM::factory("log")
->orderby(array("timestamp" => "DESC", "id" => "DESC"))->find_all(5);
@@ -59,7 +59,7 @@ class gallery_block_Core {
case "stats":
$block->css_id = "g-stats";
- $block->title = t("Gallery Stats");
+ $block->title = t("Gallery stats");
$block->content = new View("admin_block_stats.html");
$block->content->album_count =
ORM::factory("item")->where("type", "album")->where("id <>", 1)->count_all();
@@ -68,7 +68,7 @@ class gallery_block_Core {
case "platform_info":
$block->css_id = "g-platform";
- $block->title = t("Platform Information");
+ $block->title = t("Platform information");
$block->content = new View("admin_block_platform.html");
if (is_readable("/proc/loadavg")) {
$block->content->load_average =
@@ -80,14 +80,14 @@ class gallery_block_Core {
case "project_news":
$block->css_id = "g-project-news";
- $block->title = t("Gallery Project News");
+ $block->title = t("Gallery project news");
$block->content = new View("admin_block_news.html");
$block->content->feed = feed::parse("http://gallery.menalto.com/node/feed", 3);
break;
case "block_adder":
$block->css_id = "g-block-adder";
- $block->title = t("Dashboard Content");
+ $block->title = t("Dashboard content");
$block->content = self::get_add_block_form();
break;
@@ -99,7 +99,7 @@ class gallery_block_Core {
}
$block = new Block();
$block->css_id = "g-user-language-block";
- $block->title = t("Language Preference");
+ $block->title = t("Language preference");
$block->content = new View("user_languages_block.html");
$block->content->installed_locales =
array_merge(array("" => t("« none »")), $locales);
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 01a213c8..5daf1016 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -199,12 +199,12 @@ class gallery_installer {
}
access::register_permission("view", "View");
- access::register_permission("view_full", "View Full Size");
+ access::register_permission("view_full", "View full size");
access::register_permission("edit", "Edit");
access::register_permission("add", "Add");
// Mark for translation (must be the same strings as used above)
- t("View Full Size");
+ t("View full size");
t("View");
t("Edit");
t("Add");
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index feeab88a..155edfb5 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -39,8 +39,8 @@ class gallery_rss_Core {
->orderby("created", "DESC");
$feed->max_pages = ceil($all_children->find_all()->count() / $limit);
- $feed->title = t("Recent Updates");
- $feed->description = t("Recent Updates");
+ $feed->title = t("Recent updates");
+ $feed->description = t("Recent updates");
return $feed;
case "album":
diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index e3ae5f58..32fbc2c3 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -1,10 +1,10 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<div id="g-admin-advanced-settings" class="g-block">
- <h1> <?= t("Advanced Settings") ?> </h1>
+ <h1> <?= t("Advanced settings") ?> </h1>
<p>
<?= t("Here are internal Gallery configuration settings. Most of these settings are accessible elsewhere in the administrative console.") ?>
</p>
-
+
<ul id="g-action-status" class="g-message-block">
<li class="g-warning"><?= t("Change these values at your own risk!") ?></li>
</ul>
diff --git a/modules/gallery/views/admin_block_platform.html.php b/modules/gallery/views/admin_block_platform.html.php
index f27b9e7a..b1b8a2f9 100644
--- a/modules/gallery/views/admin_block_platform.html.php
+++ b/modules/gallery/views/admin_block_platform.html.php
@@ -4,7 +4,7 @@
<?= t("Host name: %host_name", array("host_name" => php_uname("n"))) ?>
</li>
<li>
- <?= t("Operating System: %os %version", array("os" => php_uname("s"), "version" => php_uname("r"))) ?>
+ <?= t("Operating system: %os %version", array("os" => php_uname("s"), "version" => php_uname("r"))) ?>
</li>
<li>
<?= t("Apache: %apache_version", array("apache_version" => function_exists("apache_get_version") ? apache_get_version() : t("Unknown"))) ?>
diff --git a/modules/gallery/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php
index 0f4c0dd8..3a48e087 100644
--- a/modules/gallery/views/admin_graphics.html.php
+++ b/modules/gallery/views/admin_graphics.html.php
@@ -13,13 +13,13 @@
</script>
<div id="g-admin-graphics" class="g-block ui-helper-clearfix">
- <h1> <?= t("Graphics Settings") ?> </h1>
+ <h1> <?= t("Graphics settings") ?> </h1>
<p>
<?= t("Gallery needs a graphics toolkit in order to manipulate your photos. Please choose one from the list below.") ?>
</p>
<div class="g-block-content">
- <h2> <?= t("Active Toolkit") ?> </h2>
+ <h2> <?= t("Active toolkit") ?> </h2>
<? if ($active == "none"): ?>
<?= new View("admin_graphics_none.html") ?>
<? else: ?>
@@ -27,7 +27,7 @@
<? endif ?>
<div class="g-available">
- <h2> <?= t("Available Toolkits") ?> </h2>
+ <h2> <?= t("Available toolkits") ?> </h2>
<? foreach (array_keys((array)$tk) as $id): ?>
<? if ($id != $active): ?>
<?= new View("admin_graphics_$id.html", array("tk" => $tk->$id, "is_active" => false)) ?>
diff --git a/modules/gallery/views/admin_graphics_none.html.php b/modules/gallery/views/admin_graphics_none.html.php
index 3ac6b4fb..e0fc4170 100644
--- a/modules/gallery/views/admin_graphics_none.html.php
+++ b/modules/gallery/views/admin_graphics_none.html.php
@@ -1,7 +1,7 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<div id="none" class="g-module-status g-warning g-block">
- <h3> <?= t("No Active Toolkit") ?> </h3>
+ <h3> <?= t("No active toolkit") ?> </h3>
<p>
<?= t("We were unable to detect a graphics program. You must install one of the toolkits below in order to use many Gallery features.") ?>
</p>
diff --git a/modules/gallery/views/admin_identity.html.php b/modules/gallery/views/admin_identity.html.php
index 358860cf..9a34dcc4 100644
--- a/modules/gallery/views/admin_identity.html.php
+++ b/modules/gallery/views/admin_identity.html.php
@@ -34,7 +34,7 @@
</script>
<div id="g-modules">
- <h1> <?= t("Manage Identity Providers") ?> </h1>
+ <h1> <?= t("Manage identity providers") ?> </h1>
<p>
<?= t("Choose a different user/group management provider.") ?>
</p>
diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index 311672de..908cc892 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -26,7 +26,7 @@
</script>
<div class="g-block">
- <h1> <?= t("Languages and Translation") ?> </h1>
+ <h1> <?= t("Languages and translation") ?> </h1>
<div class="g-block-content">
@@ -107,6 +107,6 @@
<?= $share_translations_form ?>
</div>
</div>
-
+
</div>
</div>
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 73a4bef8..107b35cc 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -1,13 +1,13 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<div id="g-admin-maintenance" class="g-block">
- <h1> <?= t("Maintenance Tasks") ?> </h1>
+ <h1> <?= t("Maintenance tasks") ?> </h1>
<p>
<?= t("Occasionally your Gallery will require some maintenance. Here are some tasks you can use to keep it running smoothly.") ?>
</p>
<div class="g-block-content">
<div id="g-available-tasks">
- <h2> <?= t("Available Tasks") ?> </h2>
+ <h2> <?= t("Available tasks") ?> </h2>
<table>
<tr>
<th>
@@ -43,11 +43,11 @@
<? if ($running_tasks->count()): ?>
<div id="g-running-tasks">
- <h2> <?= t("Running Tasks") ?> </h2>
+ <h2> <?= t("Running tasks") ?> </h2>
<table>
<tr>
<th>
- <?= t("Last Updated") ?>
+ <?= t("Last updated") ?>
</th>
<th>
<?= t("Name") ?>
@@ -116,11 +116,11 @@
<? if ($finished_tasks->count()): ?>
<div id="g-finished-tasks">
- <h2> <?= t("Finished Tasks") ?> </h2>
+ <h2> <?= t("Finished tasks") ?> </h2>
<table>
<tr>
<th>
- <?= t("Last Updated") ?>
+ <?= t("Last updated") ?>
</th>
<th>
<?= t("Name") ?>
diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php
index 7c97270c..b394aa19 100644
--- a/modules/gallery/views/admin_sidebar.html.php
+++ b/modules/gallery/views/admin_sidebar.html.php
@@ -36,7 +36,7 @@
</script>
<div id="g-block-admin" class="g-block ui-helper-clearfix">
- <h1> <?= t("Manage Sidebar") ?> </h1>
+ <h1> <?= t("Manage sidebar") ?> </h1>
<p>
<?= t("Select and drag blocks from the available column to the active column to add to the sidebar; remove by dragging the other way.") ?>
</p>
@@ -44,7 +44,7 @@
<div class="g-block-content">
<div id="g-site-blocks" ref="<?= url::site("admin/sidebar/update?csrf={$csrf}__ACTIVE__") ?>">
<div class="g-admin-blocks-list">
- <div><h3><?= t("Available Blocks") ?></h3></div>
+ <div><h3><?= t("Available blocks") ?></h3></div>
<div>
<ul id="g-available-blocks" class="g-sortable-blocks">
<?= $available ?>
@@ -52,7 +52,7 @@
</div>
</div>
<div class="g-admin-blocks-list">
- <div><h3><?= t("Active Blocks") ?></h3></div>
+ <div><h3><?= t("Active blocks") ?></h3></div>
<div>
<ul id="g-active-blocks" class="g-sortable-blocks">
<?= $active ?>
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index dda18265..d14e8bd4 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -8,7 +8,7 @@
</script>
<div class="g-block ui-helper-clearfix">
- <h1> <?= t("Theme Choice") ?> </h1>
+ <h1> <?= t("Theme choice") ?> </h1>
<p>
<?= t("Gallery allows you to choose a theme for browsing your Gallery, as well as a special theme for the administration interface. Click a theme to preview and activate it.") ?>
</p>
@@ -89,6 +89,6 @@
<? endif ?>
</div>
</div>
-
+
</div>
</div> \ No newline at end of file
diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index f4da52dc..9d14bbb2 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -6,9 +6,9 @@
<a id="g-close-l10n" title="<?= t("Stop the translation mode")->for_html_attr() ?>"
href="<?= html::clean_attribute(url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token())) ?>">X</a>
</span>
- <div class="label strings"><h2><?= t("Page Text") ?>
+ <div class="label strings"><h2><?= t("Page text") ?>
<? if (!Input::instance()->get('show_all_l10n_messages')): ?>
- <a style="background-color:#fff" href="<?= url::site("admin/languages?show_all_l10n_messages=1") ?>"><?= t("(Show All)") ?></a>
+ <a style="background-color:#fff" href="<?= url::site("admin/languages?show_all_l10n_messages=1") ?>"><?= t("(Show all)") ?></a>
<? endif; ?>
</h2></div>
<div class="label source"><h2><?= t("Source") ?></div>
@@ -73,7 +73,7 @@
</div>
</div>
<script type="text/javascript">
- var MSG_TRANSLATE_TEXT = <?= t("Translate Text")->for_js() ?>;
+ var MSG_TRANSLATE_TEXT = <?= t("Translate text")->for_js() ?>;
var l10n_client_data = <?= json_encode($string_list) ?>;
var plural_forms = <?= json_encode($plural_forms) ?>;
var toggle_l10n_mode_url = <?= html::js_string(url::site("l10n_client/toggle_l10n_mode")) ?>;
diff --git a/modules/gallery/views/login.html.php b/modules/gallery/views/login.html.php
index 971d18b8..a7734369 100644
--- a/modules/gallery/views/login.html.php
+++ b/modules/gallery/views/login.html.php
@@ -11,7 +11,7 @@
<? if (identity::is_writable()): ?>
<?= t('Logged in as %name', array('name' => html::mark_clean(
'<a href="' . url::site("form/edit/users/{$user->id}") .
- '" title="' . t("Edit Your Profile")->for_html_attr() .
+ '" title="' . t("Edit your profile")->for_html_attr() .
'" id="g-user-profile-link" class="g-dialog-link">' .
html::clean($user->display_name()) . '</a>'))) ?>
<? else: ?>
diff --git a/modules/gallery/views/login_ajax.html.php b/modules/gallery/views/login_ajax.html.php
index a9a9ef11..9741db0c 100644
--- a/modules/gallery/views/login_ajax.html.php
+++ b/modules/gallery/views/login_ajax.html.php
@@ -6,7 +6,7 @@
url: "<?= url::site("password/reset") ?>",
success: function(data) {
$("#g-login").html(data);
- $("#ui-dialog-title-g-dialog").html(<?= t("Reset Password")->for_js() ?>);
+ $("#ui-dialog-title-g-dialog").html(<?= t("Reset password")->for_js() ?>);
$(".submit").addClass("g-button ui-state-default ui-corner-all");
$(".submit").gallery_hover_init();
ajaxify_login_reset_form();
@@ -38,7 +38,7 @@
</li>
<? if (identity::is_writable()): ?>
<li>
- <a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot Your Password?") ?></a>
+ <a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot your password?") ?></a>
</li>
<? endif ?>
</ul>
diff --git a/modules/gallery/views/maintenance.html.php b/modules/gallery/views/maintenance.html.php
index 55395b73..2fdc40a3 100644
--- a/modules/gallery/views/maintenance.html.php
+++ b/modules/gallery/views/maintenance.html.php
@@ -2,7 +2,7 @@
<html>
<head>
<title>
- <?= t("Gallery - Maintenance Mode") ?>
+ <?= t("Gallery - maintenance mode") ?>
</title>
<style>
body {
@@ -38,7 +38,7 @@
</head>
<body>
<h1>
- <?= t("Gallery - Maintenance Mode") ?>
+ <?= t("Gallery - maintenance mode") ?>
</h1>
<p>
<?= t("This site is currently only accessible by site administrators.") ?>
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 9285fffe..b9c33d32 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -34,7 +34,7 @@
</ul>
<div id="g-uploadqueue-infobar">
- <?= t("Upload Queue") ?>
+ <?= t("Upload queue") ?>
<span id="g-uploadstatus"></span>
<a id="g-cancelupload" title="<?= t("Cancel all the pending uploads")->for_html_attr() ?>" onclick="swfu.cancelQueue();"><?= t("cancel") ?></a>
</div>
@@ -60,7 +60,7 @@
"csrf" => $csrf)) ?>,
file_size_limit: <?= html::js_string(ini_get("upload_max_filesize") ? num::convert_to_bytes(ini_get("upload_max_filesize"))."B" : "100MB") ?>,
file_types: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4",
- file_types_description: <?= t("Photos and Movies")->for_js() ?>,
+ file_types_description: <?= t("Photos and movies")->for_js() ?>,
file_upload_limit: 1000,
file_queue_limit: 0,
custom_settings: { },
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index 8a01cd29..fb55c4b2 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -1,7 +1,7 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<html>
<head>
- <title><?= t("Gallery 3 Upgrader") ?></title>
+ <title><?= t("Gallery 3 upgrader") ?></title>
<link rel="stylesheet" type="text/css" href="<?= url::file("modules/gallery/css/upgrader.css") ?>"
media="screen,print,projection" />
<script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
diff --git a/modules/gallery/views/welcome_message.html.php b/modules/gallery/views/welcome_message.html.php
index 4acdb156..b50163fa 100644
--- a/modules/gallery/views/welcome_message.html.php
+++ b/modules/gallery/views/welcome_message.html.php
@@ -16,10 +16,10 @@
<p>
<a href="<?= url::site("form/edit/users/{$user->id}") ?>"
- title="<?= t("Edit Your Profile")->for_html_attr() ?>"
+ title="<?= t("Edit your profile")->for_html_attr() ?>"
id="g-after-install-change-password-link"
class="g-button ui-state-default ui-corners-all">
- <?= t("Change Password Now") ?>
+ <?= t("Change password now") ?>
</a>
<script>
$("#g-after-install-change-password-link").gallery_dialog();