Skip to content

Commit

Permalink
Merge pull request #677 from norv/smallpicks
Browse files Browse the repository at this point in the history 
Small cherrypicks
  • Loading branch information
@norv
norv committed Jul 15, 2013
2 parents 608e3d1 + ebaf398 commit 57dc6bd
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 11 deletions.
4 changes: 2 additions & 2 deletions install/install_1-0_mysql.sql
View file
Expand Up @@ -1671,8 +1671,8 @@ VALUES
(8, 0, 0, 1, 'd', 1, 'birthdayemails'),
(9, 0, 0, 1, 'w', 0, 'weekly_maintenance'),
(10, 0, 120, 1, 'd', 1, 'paid_subscriptions'),
(11, 0, 120, 1, 'd', 1, 'remove_temp_attachments'),
(12, 0, 180, 1, 'd', 1, 'remove_topic_redirect'),
(11, 0, 120, 1, 'd', 0, 'remove_temp_attachments'),
(12, 0, 180, 1, 'd', 0, 'remove_topic_redirect'),
(13, 0, 240, 1, 'd', 0, 'remove_old_drafts'),
(14, 0, 0, 6, 'h', 0, 'remove_old_followups'),
(15, 0, 360, 10, 'm', 0, 'maillist_fetch_IMAP');
Expand Down
4 changes: 2 additions & 2 deletions install/install_1-0_postgresql.sql
View file
Expand Up @@ -2166,8 +2166,8 @@ INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_r
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (8, 0, 0, 1, 'd', 1, 'birthdayemails');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (9, 0, 0, 1, 'w', 0, 'weekly_maintenance');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (10, 0, 120, 1, 'd', 1, 'paid_subscriptions');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (11, 0, 120, 1, 'd', 1, 'remove_temp_attachments');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (12, 0, 180, 1, 'd', 1, 'remove_topic_redirect');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (11, 0, 120, 1, 'd', 0, 'remove_temp_attachments');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (12, 0, 180, 1, 'd', 0, 'remove_topic_redirect');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (13, 0, 240, 1, 'd', 0, 'remove_old_drafts');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (14, 0, 0, 6, 'h', 0, 'remove_old_followups');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (15, 0, 360, 10, 'm', 0, 'maillist_fetch_IMAP');
Expand Down
4 changes: 2 additions & 2 deletions install/install_1-0_sqlite.sql
View file
Expand Up @@ -1817,8 +1817,8 @@ INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_r
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (8, 0, 0, 1, 'd', 1, 'birthdayemails');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (9, 0, 0, 1, 'w', 0, 'weekly_maintenance');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (10, 0, 120, 1, 'd', 1, 'paid_subscriptions');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (11, 0, 120, 1, 'd', 1, 'remove_temp_attachments');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (12, 0, 180, 1, 'd', 1, 'remove_topic_redirect');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (11, 0, 120, 1, 'd', 0, 'remove_temp_attachments');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (12, 0, 180, 1, 'd', 0, 'remove_topic_redirect');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (13, 0, 240, 1, 'd', 0, 'remove_old_drafts');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (14, 0, 0, 6, 'h', 0, 'remove_old_followups');
INSERT INTO {$db_prefix}scheduled_tasks (id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (15, 0, 360, 10, 'm', 0, 'maillist_fetch_IMAP');
Expand Down
8 changes: 8 additions & 0 deletions install/upgrade_2-1_mysql.sql
View file
Expand Up @@ -287,3 +287,11 @@ if (@$modSettings['smfVersion'] < '2.1')
}
---}
---#

/******************************************************************************/
--- Cleaning up integration hooks
/******************************************************************************/
---# Deleting integration hooks
DELETE FROM {$db_prefix}settings
WHERE variable LIKE 'integrate_%';
---#
8 changes: 8 additions & 0 deletions install/upgrade_2-1_postgresql.sql
View file
Expand Up @@ -341,3 +341,11 @@ if (@$modSettings['smfVersion'] < '2.1')
}
---}
---#

/******************************************************************************/
--- Cleaning up integration hooks
/******************************************************************************/
---#
DELETE FROM {$db_prefix}settings
WHERE variable LIKE 'integrate_%';
---#
8 changes: 8 additions & 0 deletions install/upgrade_2-1_sqlite.sql
View file
Expand Up @@ -326,3 +326,11 @@ if (@$modSettings['ourVersion'] < '1.0')
}
---}
---#
/******************************************************************************/
--- Cleaning up integration hooks
/******************************************************************************/
---#
DELETE FROM {$db_prefix}settings
WHERE variable LIKE 'integrate_%';
---#
2 changes: 1 addition & 1 deletion themes/default/MessageIndex.template.php
View file
Expand Up @@ -235,7 +235,7 @@ function template_main()
// No topics.... just say, "sorry bub".
else
echo '
<strong>', $txt['msg_alert_none'], '</strong>';
<strong>', $txt['topic_alert_none'], '</strong>';

echo '
</li>';
Expand Down
2 changes: 1 addition & 1 deletion themes/default/PersonalMessage.template.php
View file
Expand Up @@ -567,7 +567,7 @@ function template_subject_list()
if (!$context['show_delete'])
echo '
<tr class="standard_row">
<td colspan="5">', $txt['msg_alert_none'], '</td>
<td colspan="5">', $txt['pm_alert_none'], '</td>
</tr>';
$next_alternate = false;

Expand Down
4 changes: 2 additions & 2 deletions themes/default/Recent.template.php
View file
Expand Up @@ -192,7 +192,7 @@ function template_unread()
else
echo '
<h2 class="category_header">
', $context['showing_all_topics'] ? $txt['msg_alert_none'] : $txt['unread_topics_visit_none'], '
', $context['showing_all_topics'] ? $txt['topic_alert_none'] : $txt['unread_topics_visit_none'], '
</h2>';

echo '
Expand Down Expand Up @@ -319,7 +319,7 @@ function template_replies()
else
echo '
<h2 class="category_header">
', $context['showing_all_topics'] ? $txt['msg_alert_none'] : $txt['unread_topics_visit_none'], '
', $context['showing_all_topics'] ? $txt['topic_alert_none'] : $txt['unread_topics_visit_none'], '
</h2>';

echo '
Expand Down
4 changes: 3 additions & 1 deletion themes/default/languages/index.english.php
View file
Expand Up @@ -150,7 +150,6 @@
$txt['there_are_unapproved_topics'] = 'There are %1$s topics and %2$s posts awaiting approval in this board. Click <a href="%3$s">here</a> to view them all.';
$txt['send_message'] = 'Send message';

$txt['msg_alert_none'] = 'No messages...';
$txt['msg_alert_you_have'] = 'you have'; //Deprecated
$txt['msg_alert_messages'] = 'messages'; //Deprecated
$txt['msg_alert_no_messages'] = 'you don\'t have any message';
Expand All @@ -160,6 +159,9 @@
$txt['msg_alert_many_new'] = '%1$d are new';
$txt['remove_message'] = 'Remove this message';

$txt['topic_alert_none'] = 'No messages...';
$txt['pm_alert_none'] = 'No messages...';

$txt['online_users'] = 'Users Online';
$txt['personal_message'] = 'Personal Message';
$txt['jump_to'] = 'Jump to';
Expand Down

0 comments on commit 57dc6bd

Please sign in to comment.