From: Andrew Dolgov Date: Thu, 22 Mar 2007 06:42:39 +0000 (+0100) Subject: updater: render login form on access level violation (closes #123) X-Git-Tag: 1.2.10~14 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a190ebfde1ea6b8e1ebc8a0f6acb2a019aa369c3;p=tt-rss.git updater: render login form on access level violation (closes #123) --- diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo index 4d439905..ed6893ff 100644 Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po index 6e94d8a2..a0a4a555 100644 --- a/locale/ru_RU/LC_MESSAGES/messages.po +++ b/locale/ru_RU/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-03-10 12:01+0300\n" +"POT-Creation-Date: 2007-03-22 12:41+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -114,18 +114,10 @@ msgstr "Неизвестная ошибка" msgid "This program requires XmlHttpRequest " msgstr "" -#: errors.php:6 -msgid "to function properly. Your browser doesn't seem to support it." -msgstr "" - #: errors.php:8 msgid "This program requires cookies " msgstr "" -#: errors.php:9 -msgid "to function properly. Your browser doesn't seem to support them." -msgstr "" - #: errors.php:11 msgid "Backend sanity check failed" msgstr "" @@ -170,140 +162,140 @@ msgid "" "\t\tofficial site for more information." msgstr "" -#: functions.php:2027 functions.php:2066 functions.php:2343 functions.php:3022 -#: functions.php:3052 modules/pref-feeds.php:857 +#: functions.php:2098 functions.php:2137 functions.php:2418 functions.php:3097 +#: functions.php:3127 modules/pref-feeds.php:857 msgid "Uncategorized" msgstr "Нет категории" -#: functions.php:2056 functions.php:2873 +#: functions.php:2127 functions.php:2948 msgid "Special" msgstr "Особые" -#: functions.php:2058 functions.php:2899 +#: functions.php:2129 functions.php:2974 msgid "Labels" msgstr "Метки" -#: functions.php:2076 functions.php:2365 functions.php:2883 +#: functions.php:2147 functions.php:2440 functions.php:2958 msgid "Starred articles" msgstr "Отмеченные статьи" -#: functions.php:2329 +#: functions.php:2404 msgid "Global search results" msgstr "Результаты поиска" -#: functions.php:2331 +#: functions.php:2406 msgid "Tag search results" msgstr "Результаты поиска" -#: functions.php:2347 +#: functions.php:2422 msgid "Category search results" msgstr "Результаты поиска" -#: functions.php:2360 +#: functions.php:2435 msgid "Feed search results" msgstr "Результаты поиска" -#: functions.php:2373 +#: functions.php:2448 msgid "Label search results" msgstr "Результаты поиска" -#: functions.php:2568 +#: functions.php:2643 msgid "New headlines for last 24 hours, as of " msgstr "Новые заголовки за последние 24 часа, на " -#: functions.php:2612 +#: functions.php:2687 msgid "" "You have been sent this email because you have enabled daily digests in Tiny " "Tiny RSS at " msgstr "" -#: functions.php:2614 +#: functions.php:2689 msgid "" "To unsubscribe, visit your configuration options or contact instance owner.\n" msgstr "" -#: functions.php:2780 functions.php:2809 +#: functions.php:2855 functions.php:2884 msgid "Select:" msgstr "Выбрать:" -#: functions.php:2781 functions.php:2810 +#: functions.php:2856 functions.php:2885 msgid "All" msgstr "Все" -#: functions.php:2782 functions.php:2811 functions.php:2814 tt-rss.php:164 +#: functions.php:2857 functions.php:2886 functions.php:2889 tt-rss.php:164 msgid "Unread" msgstr "Новые" -#: functions.php:2783 functions.php:2812 +#: functions.php:2858 functions.php:2887 msgid "None" msgstr "Нет" -#: functions.php:2786 +#: functions.php:2861 msgid "Toggle unread" msgstr "Изм. прочитанное" -#: functions.php:2787 +#: functions.php:2862 msgid "Toggle starred" msgstr "Изм. отмеченное" -#: functions.php:2789 +#: functions.php:2864 msgid "Mark as read" msgstr "Как прочитанные" -#: functions.php:2790 +#: functions.php:2865 msgid "This page" msgstr "Эту страницу" -#: functions.php:2791 +#: functions.php:2866 msgid "Entire feed" msgstr "Весь канал" -#: functions.php:2796 +#: functions.php:2871 msgid "Next page" msgstr "След. стр." -#: functions.php:2797 +#: functions.php:2872 msgid "Previous page" msgstr "Пред. cтр." -#: functions.php:2798 +#: functions.php:2873 msgid "First page" msgstr "На первую" -#: functions.php:2814 +#: functions.php:2889 msgid "Toggle:" msgstr "Изменить:" -#: functions.php:2815 tt-rss.php:163 +#: functions.php:2890 tt-rss.php:163 msgid "Starred" msgstr "Отмеченные" -#: functions.php:2817 +#: functions.php:2892 msgid "Mark as read:" msgstr "Пометить как прочит.:" -#: functions.php:2818 +#: functions.php:2893 msgid "Page" msgstr "Страница" -#: functions.php:2819 modules/pref-feeds.php:837 modules/pref-feeds.php:890 +#: functions.php:2894 modules/pref-feeds.php:837 modules/pref-feeds.php:890 #: modules/pref-filters.php:261 msgid "Feed" msgstr "Канал" -#: functions.php:2828 +#: functions.php:2903 msgid "Convert to Label" msgstr "Превратить в метку" -#: functions.php:2855 +#: functions.php:2930 msgid "Generated feed" msgstr "" -#: functions.php:3092 +#: functions.php:3167 msgid "No feeds to display." msgstr "Нет каналов для отображения." -#: functions.php:3109 +#: functions.php:3184 msgid "Tags" msgstr "Теги" @@ -618,10 +610,6 @@ msgstr "" msgid "config: SESSION_EXPIRE_TIME should be greater or equal to" msgstr "" -#: sanity_check.php:53 -msgid "SESSION_COOKIE_LIFETIME" -msgstr "" - #: sanity_check.php:61 msgid "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE" msgstr "" @@ -711,9 +699,9 @@ msgstr "Обновить" msgid "No feed selected." msgstr "Канал не выбран." -#: update.php:24 -msgid "Error: your access level is insufficient to run this script." -msgstr "" +#: update.php:23 +msgid "Your access level is insufficient to run this script." +msgstr "В доступе отказано - недостаточный уровень привилегий." #: update.php:49 msgid "Database Updater" diff --git a/update.php b/update.php index 27cd871f..3851679a 100644 --- a/update.php +++ b/update.php @@ -20,8 +20,8 @@ $owner_uid = $_SESSION["uid"]; if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) { - print "

". - __("Error: your access level is insufficient to run this script.")."

"; + $_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script."); + render_login_form($link); exit; }