! minor cleanup, txt tweaks

elkarte · May 18, 2024 · 3670dc5 · 3670dc5
1 parent 0f984d1
commit 3670dc5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/sources/ElkArte/Languages/Index/English.php b/sources/ElkArte/Languages/Index/English.php
@@ -818,7 +818,7 @@
 $txt['preview_fetch'] = 'Fetching preview...';
 $txt['pm_error_while_submitting'] = 'The following error or errors occurred while sending this personal message:';
 $txt['warning_while_submitting'] = 'Something happened, review it here:';
-$txt['error_while_submitting'] = 'The message has the following error or errors that must be corrected before continuing:';
+$txt['error_while_submitting'] = 'The message has the following error or errors that must be corrected before posting:';
 $txt['error_old_topic'] = 'Warning: this topic has not been posted in for at least %1$d days.<br />Unless you\'re sure you want to reply, please consider starting a new topic.';
 
 $txt['split_selected_posts'] = 'Selected posts';

diff --git a/sources/ElkArte/Languages/Profile/English.php b/sources/ElkArte/Languages/Profile/English.php
@@ -305,7 +305,7 @@
 $txt['return_to_post'] = 'Return to topics after posting by default.';
 $txt['no_new_reply_warning'] = 'Don\'t warn on new replies made while posting.';
 $txt['recent_pms_at_top'] = 'Show most recent personal messages at top.';
-$txt['wysiwyg_default'] = 'Show WYSIWYG editor on post page by default.';
+$txt['wysiwyg_default'] = 'Start editor in WYSIWYG mode by default.';
 
 $txt['timeformat_default'] = '(Forum Default)';
 $txt['timeformat_easy1'] = 'Month Day, Year, HH:MM:SS am/pm';

diff --git a/sources/ElkArte/TopicUtil.php b/sources/ElkArte/TopicUtil.php
@@ -111,17 +111,14 @@ public static function prepareContext($topics_info, $topic_seen = false, $previe
 
 			// Decide how many pages the topic should have.
 			$topic_length = $row['num_replies'] + 1;
+			$pages = '';
 			if ($topic_length > $messages_per_page)
 			{
 				// We can't pass start by reference.
 				$start = -1;
 				$show_all = !empty($modSettings['enableAllMessages']) && $topic_length < $modSettings['enableAllMessages'];
 				$pages = constructPageIndex('{scripturl}?topic=' . $row['id_topic'] . '.%1$d' . $topicseen, $start, $topic_length, $messages_per_page, true, array('prev_next' => false, 'all' => $show_all));
 			}
-			else
-			{
-				$pages = '';
-			}
 
 			$row['new_from'] = $row['new_from'] ?? 0;
 			$first_poster_href = getUrl('profile', ['action' => 'profile', 'u' => $row['first_id_member'], 'name' => $row['first_display_name']]);

diff --git a/sources/subs/Drafts.subs.php b/sources/subs/Drafts.subs.php
@@ -564,8 +564,8 @@ function saveDraft($draft, $check_last_save = false)
  * - The core draft feature must be enabled, as well as the pm draft option
  * - Determines if this is a new or and update to an existing pm draft
  *
- * @param mixed[] $recipientList
- * @param mixed[] $draft
+ * @param array $recipientList
+ * @param array $draft
  * @param bool $check_last_save
  *
  * @return bool|void

diff --git a/themes/default/GenericHelpers.template.php b/themes/default/GenericHelpers.template.php
@@ -121,7 +121,7 @@ function template_select_boards($name, $label = '', $extra = '', $all = false)
  * 		'counter' => (optional) if set, will add a count indicator span in front of the link text
  * ]]
  *
- * @param mixed[] $button_strip the above definition array
+ * @param array $button_strip the above definition array
  * @param string $class overall class to append to "buttonlist no_js" on the list UL
  * @param array $strip_options = [] of options applied to the outer <UL>
  * 		'id' => id to use on the UL

diff --git a/themes/default/scripts/post.js b/themes/default/scripts/post.js
@@ -10,7 +10,7 @@
  */
 
 /** global: $editor_data, elk_scripturl, elk_session_var, elk_session_id */
-/** global: poll_add, poll_remove, XMLHttpRequest, form_name */
+/** global: poll_add, poll_remove, XMLHttpRequest, form_name, preview_area */
 
 /**
  * This file contains javascript associated with the posting and previewing