Skip to content

Commit

Permalink
! Fixed a $txt['here'] that was removed long ago (because it was used…
Browse files Browse the repository at this point in the history 
… in this case outside of its original context-- wow, nice for translators!). Replaced it with some random Unicode character that's supposed to indicate the current location. Please tell me if you find anything better that doesn't require the use of words. (ManageSmileys.template.php)

* Also updated all colons to $txt[':'] in that file. I'm not gonna do all files... Just figured I'd do that one. (ManageSmileys.template.php)
  • Loading branch information
@Nao
Nao committed Feb 27, 2017
1 parent c2bee20 commit ec62771
Showing 1 changed file with 25 additions and 28 deletions.
53 changes: 25 additions & 28 deletions core/html/ManageSmileys.template.php
View file
Expand Up @@ -33,24 +33,22 @@ function template_modifyset()

// If this is an existing set, and there are still un-added smileys - offer an import opportunity.
if (!empty($context['current_set']['can_import']))
{
echo '
<div class="information">
', $context['current_set']['can_import'] == 1 ? $txt['smiley_set_import_single'] : $txt['smiley_set_import_multiple'], ' <a href="<URL>?action=admin;area=smileys;sa=import;set=', $context['current_set']['id'], ';', $context['session_query'], '">', $txt['here'], '</a> ', $context['current_set']['can_import'] == 1 ? $txt['smiley_set_to_import_single'] : $txt['smiley_set_to_import_multiple'], '
', $context['current_set']['can_import'] == 1 ? $txt['smiley_set_import_single'] : $txt['smiley_set_import_multiple'], ' <a href="<URL>?action=admin;area=smileys;sa=import;set=', $context['current_set']['id'], ';', $context['session_query'], '">&#8982;</a> ', $context['current_set']['can_import'] == 1 ? $txt['smiley_set_to_import_single'] : $txt['smiley_set_to_import_multiple'], '
</div>';
}

echo '
<div class="windowbg wrc">
<dl class="settings">
<dt>
<strong><label for="smiley_sets_name">', $txt['smiley_sets_name'], '</label>: </strong>
<strong><label for="smiley_sets_name">', $txt['smiley_sets_name'], '</label>', $txt[':'], '</strong>
</dt>
<dd>
<input name="smiley_sets_name" id="smiley_sets_name" value="', $context['current_set']['name'], '">
</dd>
<dt>
<strong><label for="smiley_sets_path">', $txt['smiley_sets_url'], '</label>: </strong>
<strong><label for="smiley_sets_path">', $txt['smiley_sets_url'], '</label>', $txt[':'], '</strong>
</dt>
<dd>
', SMILEYS, '/';
Expand All @@ -61,7 +59,6 @@ function template_modifyset()
elseif (empty($context['smiley_set_dirs']))
echo '
<input name="smiley_sets_path" id="smiley_sets_path" value="', $context['current_set']['path'], '"> ';

else
{
echo '
Expand All @@ -79,7 +76,7 @@ function template_modifyset()
/..
</dd>
<dt>
<strong><label for="smiley_sets_default">', $txt['smiley_set_select_default'], '</label>: </strong>
<strong><label for="smiley_sets_default">', $txt['smiley_set_select_default'], '</label>', $txt[':'], '</strong>
</dt>
<dd>
<input type="checkbox" name="smiley_sets_default" id="smiley_sets_default" value="1"', $context['current_set']['selected'] ? ' checked' : '', '>
Expand All @@ -89,7 +86,7 @@ function template_modifyset()
if ($context['current_set']['is_new'] && !empty($settings['smiley_enable']))
echo '
<dt>
<strong><label for="smiley_sets_import">', $txt['smiley_set_import_directory'], '</label>: </strong>
<strong><label for="smiley_sets_import">', $txt['smiley_set_import_directory'], '</label>', $txt[':'], '</strong>
</dt>
<dd>
<input type="checkbox" name="smiley_sets_import" id="smiley_sets_import" value="1">
Expand Down Expand Up @@ -117,10 +114,10 @@ function template_modifysmiley()
<div class="windowbg wrc">
<dl class="settings">
<dt>
<strong>', $txt['smiley_preview'], ': </strong>
<strong>', $txt['smiley_preview'], $txt[':'], '</strong>
</dt>
<dd>
<img src="', SMILEYS, '/', $settings['smiley_sets_default'], '/', $context['current_smiley']['filename'], '" id="preview"> (', $txt['smiley_preview_using'], ': <select name="set" onchange="updatePreview();">';
<img src="', SMILEYS, '/', $settings['smiley_sets_default'], '/', $context['current_smiley']['filename'], '" id="preview"> (', $txt['smiley_preview_using'], $txt[':'], ' <select name="set" onchange="updatePreview();">';

foreach ($context['smiley_sets'] as $smiley_set)
echo '
Expand All @@ -130,13 +127,13 @@ function template_modifysmiley()
</select>)
</dd>
<dt>
<strong><label for="smiley_code">', $txt['smileys_code'], '</label>: </strong>
<strong><label for="smiley_code">', $txt['smileys_code'], '</label>', $txt[':'], '</strong>
</dt>
<dd>
<input name="smiley_code" id="smiley_code" value="', $context['current_smiley']['code'], '">
</dd>
<dt>
<strong><label for="smiley_filename">', $txt['smileys_filename'], '</label>: </strong>
<strong><label for="smiley_filename">', $txt['smileys_filename'], '</label>', $txt[':'], '</strong>
</dt>
<dd>';

Expand All @@ -157,13 +154,13 @@ function template_modifysmiley()
echo '
</dd>
<dt>
<strong><label for="smiley_description">', $txt['smileys_description'], '</label>: </strong>
<strong><label for="smiley_description">', $txt['smileys_description'], '</label>', $txt[':'], '</strong>
</dt>
<dd>
<input name="smiley_description" id="smiley_description" value="', $context['current_smiley']['description'], '">
</dd>
<dt>
<strong><label for="smiley_location">', $txt['smileys_location'], '</label>: </strong>
<strong><label for="smiley_location">', $txt['smileys_location'], '</label>', $txt[':'], '</strong>
</dt>
<dd>
<select name="smiley_location" id="smiley_location">
Expand Down Expand Up @@ -239,7 +236,7 @@ function selectMethod(element)
<img src="', SMILEYS, '/', $settings['smiley_sets_default'], '/', $context['filenames'][0]['id'], '" id="preview">
</dt>
<dd>
', $txt['smiley_preview_using'], ': <select name="set" onchange="updatePreview(); selectMethod(\'existing\');">';
', $txt['smiley_preview_using'], $txt[':'], ' <select name="set" onchange="updatePreview(); selectMethod(\'existing\');">';

foreach ($context['smiley_sets'] as $smiley_set)
echo '
Expand All @@ -249,7 +246,7 @@ function selectMethod(element)
</select>
</dd>
<dt>
<strong><label for="smiley_filename">', $txt['smileys_filename'], '</label>: </strong>
<strong><label for="smiley_filename">', $txt['smileys_filename'], '</label>', $txt[':'], '</strong>
</dt>
<dd>';

Expand All @@ -276,14 +273,14 @@ function selectMethod(element)
<fieldset id="ul_settings" class="hide">
<dl class="settings">
<dt>
<strong>', $txt['smileys_add_upload_choose'], ':</strong>
<strong>', $txt['smileys_add_upload_choose'], $txt[':'], '</strong>
<dfn>', $txt['smileys_add_upload_choose_desc'], '</dfn>
</dt>
<dd>
<input type="file" name="uploadSmiley" id="uploadSmiley" onchange="selectMethod(\'upload\');">
</dd>
<dt>
<strong><label for="sameall">', $txt['smileys_add_upload_all'], ':</label></strong>
<strong><label for="sameall">', $txt['smileys_add_upload_all'], $txt[':'], '</label></strong>
</dt>
<dd>
<input type="checkbox" name="sameall" id="sameall" checked onclick="swapUploads(); selectMethod(\'upload\');">
Expand All @@ -294,7 +291,7 @@ function selectMethod(element)
foreach ($context['smiley_sets'] as $smiley_set)
echo '
<dt>
', $txt['smileys_add_upload_for1'], ' <strong>', $smiley_set['name'], '</strong> ', $txt['smileys_add_upload_for2'], ':
', $txt['smileys_add_upload_for1'], ' <strong>', $smiley_set['name'], '</strong> ', $txt['smileys_add_upload_for2'], $txt[':'], '
</dt>
<dd>
<input type="file" name="individual_', $smiley_set['name'], '" onchange="selectMethod(\'upload\');">
Expand All @@ -311,19 +308,19 @@ function selectMethod(element)
<div class="windowbg wrc">
<dl class="settings">
<dt>
<strong><label for="smiley_code">', $txt['smileys_code'], '</label>: </strong>
<strong><label for="smiley_code">', $txt['smileys_code'], '</label>', $txt[':'], '</strong>
</dt>
<dd>
<input name="smiley_code" id="smiley_code" value="">
</dd>
<dt>
<strong><label for="smiley_description">', $txt['smileys_description'], '</label>: </strong>
<strong><label for="smiley_description">', $txt['smileys_description'], '</label>', $txt[':'], '</strong>
</dt>
<dd>
<input name="smiley_description" id="smiley_description" value="">
</dd>
<dt>
<strong><label for="smiley_location">', $txt['smileys_location'], '</label>: </strong>
<strong><label for="smiley_location">', $txt['smileys_location'], '</label>', $txt[':'], '</strong>
</dt>
<dd>
<select name="smiley_location" id="smiley_location">
Expand Down Expand Up @@ -418,28 +415,28 @@ function template_editicon()
if (!$context['new_icon'])
echo '
<dt>
<strong>', $txt['smiley_preview'], ': </strong>
<strong>', $txt['smiley_preview'], $txt[':'], '</strong>
</dt>
<dd>
<img src="', $context['icon']['image_url'], '" alt="', $context['icon']['title'], '">
</dd>';

echo '
<dt>
<strong><label for="icon_filename">', $txt['smileys_filename'], '</label>: </strong>
<strong><label for="icon_filename">', $txt['smileys_filename'], '</label>', $txt[':'], '</strong>
<dfn>', $txt['icons_filename_all_gif'], '</dfn>
</dt>
<dd>
<input name="icon_filename" id="icon_filename" value="', !empty($context['icon']['filename']) ? $context['icon']['filename'] . '.gif' : '', '">
</dd>
<dt>
<strong><label for="icon_description">', $txt['smileys_description'], '</label>: </strong>
<strong><label for="icon_description">', $txt['smileys_description'], '</label>', $txt[':'], '</strong>
</dt>
<dd>
<input name="icon_description" id="icon_description" value="', !empty($context['icon']['title']) ? $context['icon']['title'] : '', '">
</dd>
<dt>
<strong><label for="icon_board_select">', $txt['icons_board'], '</label>: </strong>
<strong><label for="icon_board_select">', $txt['icons_board'], '</label>', $txt[':'], '</strong>
</dt>
<dd>
<select name="icon_board" id="icon_board_select">
Expand All @@ -462,7 +459,7 @@ function template_editicon()
</select>
</dd>
<dt>
<strong><label for="icon_location">', $txt['smileys_location'], '</label>: </strong>
<strong><label for="icon_location">', $txt['smileys_location'], '</label>', $txt[':'], '</strong>
</dt>
<dd>
<select name="icon_location" id="icon_location">
Expand All @@ -472,7 +469,7 @@ function template_editicon()
foreach ($context['icons'] as $id => $data)
if (empty($context['icon']['id']) || $id != $context['icon']['id'])
echo '
<option value="', $id, '"', !empty($context['icon']['after']) && $id == $context['icon']['after'] ? ' selected' : '', '>', $txt['icons_location_after'], ': ', $data['title'], '</option>';
<option value="', $id, '"', !empty($context['icon']['after']) && $id == $context['icon']['after'] ? ' selected' : '', '>', $txt['icons_location_after'], $txt[':'], ' ', $data['title'], '</option>';

echo '
</select>
Expand Down

0 comments on commit ec62771

Please sign in to comment.