Commit 03460f03 authored by kiz_0987's avatar kiz_0987

#105811 - Fixed t('') calls with '%' in them. Hopefully all of them!

parent c8ec6eee
......@@ -203,9 +203,9 @@ function gallery_page() {
list ($success, $ret) = _gallery_init(true);
if (!$success) {
gallery_error(t('Unable to initialize embedded Gallery'), $ret);
$err_msg = t('Unable to initialize embedded Gallery. You need to <a href="%link">
$err_msg = t('Unable to initialize embedded Gallery. You need to <a href="@link">
configure your embedded Gallery</a>.',
array('%link' => url('admin/settings/gallery')));
array('@link' => url('admin/settings/gallery')));
return $err_msg;
}
// Turn off sidebar
......
......@@ -41,9 +41,9 @@ function _gallery_block($op = 'list', $delta = 0, $edit = array()) {
}
list ($success, $ret) = _gallery_init(true);
if (!$success) {
$err_msg = t('Unable to initialize embedded Gallery. You need to <a href="%link">
$err_msg = t('Unable to initialize embedded Gallery. You need to <a href="@link">
configure your embedded Gallery</a>.',
array('%link' => url('admin/settings/gallery')));
array('@link' => url('admin/settings/gallery')));
gallery_error($err_msg, $ret);
return;
}
......@@ -153,4 +153,4 @@ function _gallery_block($op = 'list', $delta = 0, $edit = array()) {
}
}
?>
\ No newline at end of file
?>
......@@ -12,17 +12,10 @@
function _gallery_help($section) {
switch($section) {
case 'admin/settings/modules#description':
return t('Integration with Gallery2.1 and above (%gallery_url)', array('%gallery_url' => 'http://gallery.menalto.com/'));
case 'filter#short-tip' :
return gallery_filter_short_tip_translated();
case 'filter#long-tip' :
return gallery_filter_long_tip_translated();
case 'admin/help#gallery_filter' :
return t('<p>Used to add image blocks from your embedded Gallery 2 to a node
like a blog entry or a story. To enable this feature and learn the proper syntax,
visit the <a href="%filters">filters configuration screen</a>.</p>',
array ('%filters' => url('admin/filters')));
case 'admin/help#gallery':
$output = t('
<h3>Online Documentation</h3>
......@@ -94,13 +87,14 @@ function _gallery_help($section) {
return $output;
case 'admin/settings/gallery':
return t('');
/* Used in the default value for the pages list in g2image settings */
case 'admin/settings/gallery_g2image#pages':
return "node/*\ncomment/*";
}
}
function gallery_filter_short_tip_translated() {
return t('You may link to Gallery2 items on this site <a href="%explanation-url">using a special syntax</a>.', array ('%explanation-url' => url('filter/tips', NULL, 'filter-gallery-0')));
return t('You may link to Gallery2 items on this site <a href="@explanation-url">using a special syntax</a>.', array ('@explanation-url' => url('filter/tips', NULL, 'filter-gallery-0')));
}
function gallery_filter_long_tip_translated() {
......
......@@ -17,9 +17,9 @@ function _gallery_search($op = 'search', $keys = null) {
list ($success, $ret) = _gallery_init(true);
if (!$success) {
$err_msg = t('Unable to initialize embedded Gallery. You need to <a href="%link">
$err_msg = t('Unable to initialize embedded Gallery. You need to <a href="@link">
configure your embedded Gallery</a>.',
array('%link' => url('admin/settings/gallery')));
array('@link' => url('admin/settings/gallery')));
gallery_error($err_msg, $ret);
return;
}
......@@ -163,14 +163,14 @@ function _gallery_search_page($results) {
$count = $table['count'];
if ($count > $max_items) {
$count = $max_items;
$count_text = t(' (>%count items found)', array(
'%count' => $count));
$count_text = t(' (>@count items found)', array(
'@count' => $count));
} else {
$count_text = t(' (%count %item found)', array(
'%item' => ($count == 1) ? t('item') : t('items'),
'%count' => $count));
$count_text = t(' (@count @item found)', array(
'@item' => ($count == 1) ? t('item') : t('items'),
'@count' => $count));
}
$output .= t('%name Results', array('%name' => $table['name']));
$output .= t('@name Results', array('@name' => $table['name']));
$output .= $count_text . '</h2>';
if ($count > 0) {
......@@ -223,4 +223,4 @@ function gallery_search_item($item) {
return $output;
}
?>
\ No newline at end of file
?>
......@@ -401,7 +401,7 @@ function _gallery_filter_settings($typeMap , $paramMap) {
'#type' => 'checkbox',
'#title' => t('Cache gallery filter pages'),
'#default_value' => variable_get('gallery_filter_can_cache', 1),
'#description' => t('By default the gallery filter output is cached by Drupal to speed up page loading. However, it will not cache the css class info for the frames. The best approach is the make sure that the sidebar image block and the gallery filter images use the same frames. If you are unable to do this you will have to deselect this option to force Drupal not to cache the pages, or else your frames will not appear. If you change this option you will need to go to <a href="%link">admin/filters</a> and re-save the image formats that use gallery filter.', array('%link' => url('admin/filters'))),
'#description' => t('By default the gallery filter output is cached by Drupal to speed up page loading. However, it will not cache the css class info for the frames. The best approach is the make sure that the sidebar image block and the gallery filter images use the same frames. If you are unable to do this you will have to deselect this option to force Drupal not to cache the pages, or else your frames will not appear. If you change this option you will need to go to <a href="@link">admin/filters</a> and re-save the image formats that use gallery filter.', array('@link' => url('admin/filters'))),
);
$form['filter']['gallery_filter_n_images'] = array(
......@@ -590,7 +590,7 @@ function _gallery_g2image_settings() {
t('Show on every page except the listed pages.'),
t('Show on only the listed pages.')
);
$description = t("Enter one page per line as Drupal paths. The '*' character is a wildcard. Example paths are '%blog' for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array('%blog' => theme('placeholder', 'blog'), '%blog-wildcard' => theme('placeholder', 'blog/*'), '%front' => theme('placeholder', '<front>')));
$description = t("Enter one page per line as Drupal paths. The '*' character is a wildcard. Example paths are '%blog' for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '<front>'));
$form['g2image']['gallery_g2image_only_listed_pages'] = array(
'#type' => 'radios',
......@@ -726,7 +726,7 @@ function _gallery_g2image_settings() {
for ($i=1; $i<=4; $i++) {
$form['g2image']['gallery_g2image_custom_class'][$i] = array(
'#type' => 'textfield',
'#title' => t('Custom Class %index', array('%index' => $i)),
'#title' => t('Custom Class @index', array('@index' => $i)),
'#default_value' => $gallery_g2image_custom_class[$i],
'#size' => 20,
'#maxlength' => 50,
......@@ -926,9 +926,9 @@ function _gallery_configure_url_rewrite() {
/* G2 Error handling */
// All other tests were run already
$results['urlrewrite']['error'] = true;
$results['urlrewrite']['notice'] =t(
'Gallery2 Error when trying to access URL Rewrite Module status. %ret',
array('%ret' => $ret->getAsHtml()));
$results['urlrewrite']['notice'] = t(
'Gallery2 Error when trying to access URL Rewrite Module status. @ret',
array('@ret' => $ret->getAsHtml()));
}
list ($ret, $params) = $rewriteApi->fetchEmbedConfig();
......@@ -941,7 +941,7 @@ function _gallery_configure_url_rewrite() {
fclose($f);
} else {
$results['urlrewrite']['error'] = true;
$results['urlrewrite']['notice'] = t('There is no .htaccess file in your defined Drupal directory (%dir) and the directory is not writable. Please create a writable .htaccess file in that directory.', array('%dir' => $htaccess_path));
$results['urlrewrite']['notice'] = t('There is no .htaccess file in your defined Drupal directory (@dir) and the directory is not writable. Please create a writable .htaccess file in that directory.', array('@dir' => $htaccess_path));
$num_errors++;
return array($num_errors, $num_warnings, $results['urlrewrite']);
}
......@@ -967,7 +967,7 @@ function _gallery_configure_url_rewrite() {
}
} else {
$results['urlrewrite']['error'] = true;
$results['urlrewrite']['notice'] = t('The .htaccess file in your defined Drupal directory (%dir) is not writable. Please CHMOD it to 644 (or 666 if 644 does not work).', array('%dir' => $htaccess_path));
$results['urlrewrite']['notice'] = t('The .htaccess file in your defined Drupal directory (@dir) is not writable. Please CHMOD it to 644 (or 666 if 644 does not work).', array('@dir' => $htaccess_path));
$num_errors++;
}
}
......@@ -998,7 +998,7 @@ function _gallery_g2image_settings_form_validate(&$form_values) {
if (is_writable($filename) == false && !file_check_directory($path)) {
$results['gallery_g2image']['title'] = $title;
$results['gallery_g2image']['warning'] = true;
$results['gallery_g2image']['notice'] = t('g2image does not seem to be installed for %mode mode in the required directory (%dir), or the directory is not writable. Please see the INSTALL.txt for instructions.', array('%mode' => $mode, '%dir' => '&lt;drupal_path&gt;'.$path));
$results['gallery_g2image']['notice'] = t('g2image does not seem to be installed for @mode mode in the required directory (@dir), or the directory is not writable. Please see the INSTALL.txt for instructions.', array('@mode' => $mode, '@dir' => '&lt;drupal_path&gt;'.$path));
$num_warnings++;
return array($num_errors, $num_warnings, $results['gallery_g2image']);
}
......@@ -1059,7 +1059,7 @@ function _gallery_g2image_settings_form_validate(&$form_values) {
if (is_writable($filename) == false) {
$results['gallery_g2image']['title'] = $title;
$results['gallery_g2image']['warning'] = true;
$results['gallery_g2image']['notice'] = t('Could not write to g2image config file. Please check the permissions for %filename.', array('%filename' => $filename));
$results['gallery_g2image']['notice'] = t('Could not write to g2image config file. Please check the permissions for @filename.', array('@filename' => $filename));
$num_warnings++;
return array($num_errors, $num_warnings, $results['gallery_g2image']);
}
......@@ -1067,7 +1067,7 @@ function _gallery_g2image_settings_form_validate(&$form_values) {
if (fwrite($handle, $content) === FALSE) {
$results['gallery_g2image']['title'] = $title;
$results['gallery_g2image']['warning'] = true;
$results['gallery_g2image']['notice'] = t('Could not write to g2image config file. Please check the permissions for %filename.', array('%filename' => $filename));
$results['gallery_g2image']['notice'] = t('Could not write to g2image config file. Please check the permissions for @filename.', array('@filename' => $filename));
$num_warnings++;
return array($num_errors, $num_warnings, $results['gallery_g2image']);
} else {
......
......@@ -20,9 +20,9 @@ require_once($path . '/gallery_roles.inc');
function gallery_insert_user(&$edit, $user) {
list ($success, $ret) = _gallery_init();
if (!$success) {
$err_msg = t('Unable to initialize embedded Gallery. You need to <a href="%link">
$err_msg = t('Unable to initialize embedded Gallery. You need to <a href="@link">
configure your embedded Gallery</a>.',
array('%link' => url('admin/settings/gallery')));
array('@link' => url('admin/settings/gallery')));
gallery_error($err_msg, $ret);
return;
}
......@@ -43,9 +43,9 @@ function gallery_insert_user(&$edit, $user) {
function gallery_update_user(&$edit, $user) {
list ($success, $ret) = _gallery_init();
if (!$success) {
$err_msg = t('Unable to initialize embedded Gallery. You need to <a href="%link">
$err_msg = t('Unable to initialize embedded Gallery. You need to <a href="@link">
configure your embedded Gallery</a>.',
array('%link' => url('admin/settings/gallery')));
array('@link' => url('admin/settings/gallery')));
gallery_error($err_msg, $ret);
return;
}
......@@ -83,9 +83,9 @@ function gallery_update_user(&$edit, $user) {
function gallery_delete_user($user) {
list ($success, $ret) = _gallery_init();
if (!$success) {
$err_msg = t('Unable to initialize embedded Gallery. You need to <a href="%link">
$err_msg = t('Unable to initialize embedded Gallery. You need to <a href="@link">
configure your embedded Gallery</a>.',
array('%link' => url('admin/settings/gallery')));
array('@link' => url('admin/settings/gallery')));
gallery_error($err_msg, $ret);
return;
}
......@@ -313,9 +313,9 @@ function _gallery_users() {
list ($success, $ret) = _gallery_init(true);
if (!$success) {
$err_msg = t('Unable to initialize embedded Gallery. You need to <a href="%link">
$err_msg = t('Unable to initialize embedded Gallery. You need to <a href="@link">
configure your embedded Gallery</a>.',
array('%link' => url('admin/settings/gallery')));
array('@link' => url('admin/settings/gallery')));
gallery_error($err_msg, $ret);
return;
}
......@@ -354,9 +354,9 @@ function _gallery_users() {
function gallery_user_info($user, $full = false) {
list ($success, $ret) = _gallery_init(true);
if (!$success) {
$err_msg = t('Unable to initialize embedded Gallery. You need to <a href="%link">
$err_msg = t('Unable to initialize embedded Gallery. You need to <a href="@link">
configure your embedded Gallery</a>.',
array('%link' => url('admin/settings/gallery')));
array('@link' => url('admin/settings/gallery')));
gallery_error($err_msg, $ret);
return;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment