From 23419d117bf6db266ce2fc4b7e8d14e96b788f9b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 5 Jan 2013 01:28:07 +0400 Subject: [PATCH] modify includes to init session before translations are applied --- backend.php | 2 +- include/localized_schema.php | 2 +- index.php | 2 +- messages.pot | 235 +++++++++++++++++++---------------- prefs.php | 2 +- public.php | 2 +- 6 files changed, 133 insertions(+), 112 deletions(-) diff --git a/backend.php b/backend.php index cc45b6a8..e718f810 100644 --- a/backend.php +++ b/backend.php @@ -37,8 +37,8 @@ @$csrf_token = $_REQUEST['csrf_token']; - require_once "functions.php"; require_once "sessions.php"; + require_once "functions.php"; require_once "config.php"; require_once "db.php"; require_once "db-prefs.php"; diff --git a/include/localized_schema.php b/include/localized_schema.php index 11b5470c..51acc8f8 100644 --- a/include/localized_schema.php +++ b/include/localized_schema.php @@ -1,4 +1,4 @@ -\n" "Language-Team: LANGUAGE \n" @@ -243,7 +243,7 @@ msgstr "" #: index.php:108 index.php:150 index.php:236 prefs.php:86 #: classes/backend.php:6 classes/pref/labels.php:296 #: classes/pref/filters.php:602 classes/pref/feeds.php:1342 -#: plugins/digest/digest_body.php:45 js/viewfeed.js:1169 +#: plugins/digest/digest_body.php:45 js/viewfeed.js:1169 js/viewfeed.js:1158 msgid "Loading, please wait..." msgstr "" @@ -801,11 +801,11 @@ msgstr "" msgid "Search results: %s" msgstr "" -#: include/functions.php:3067 js/viewfeed.js:1998 +#: include/functions.php:3067 js/viewfeed.js:1998 js/viewfeed.js:1971 msgid "Click to play" msgstr "" -#: include/functions.php:3068 js/viewfeed.js:1997 +#: include/functions.php:3068 js/viewfeed.js:1997 js/viewfeed.js:1970 msgid "Play" msgstr "" @@ -930,7 +930,7 @@ msgstr "" msgid "Set starred" msgstr "" -#: include/localized_schema.php:12 js/viewfeed.js:501 +#: include/localized_schema.php:12 js/viewfeed.js:501 js/viewfeed.js:490 msgid "Publish article" msgstr "" @@ -938,7 +938,7 @@ msgstr "" msgid "Assign tags" msgstr "" -#: include/localized_schema.php:14 js/viewfeed.js:1962 +#: include/localized_schema.php:14 js/viewfeed.js:1962 js/viewfeed.js:1935 msgid "Assign label" msgstr "" @@ -1128,7 +1128,7 @@ msgstr "" msgid "User timezone" msgstr "" -#: include/localized_schema.php:60 js/prefs.js:1856 +#: include/localized_schema.php:60 js/prefs.js:1856 js/prefs.js:1743 msgid "Customize stylesheet" msgstr "" @@ -1884,7 +1884,7 @@ msgstr "" msgid "Save rule" msgstr "" -#: classes/pref/filters.php:788 js/functions.js:1067 +#: classes/pref/filters.php:788 js/functions.js:1067 js/functions.js:1063 msgid "Add rule" msgstr "" @@ -1900,7 +1900,7 @@ msgstr "" msgid "Save action" msgstr "" -#: classes/pref/filters.php:855 js/functions.js:1093 +#: classes/pref/filters.php:855 js/functions.js:1093 js/functions.js:1089 msgid "Add action" msgstr "" @@ -2158,7 +2158,7 @@ msgstr "" msgid "Reset sort order" msgstr "" -#: classes/pref/feeds.php:1292 js/prefs.js:2021 +#: classes/pref/feeds.php:1292 js/prefs.js:2021 js/prefs.js:1788 msgid "Batch subscribe" msgstr "" @@ -2478,11 +2478,11 @@ msgstr "" msgid "Start update" msgstr "" -#: js/feedlist.js:283 +#: js/feedlist.js:283 js/feedlist.js:282 msgid "New articles available in this feed (click to show)" msgstr "" -#: js/feedlist.js:490 js/feedlist.js:505 +#: js/feedlist.js:490 js/feedlist.js:505 js/feedlist.js:489 js/feedlist.js:504 msgid "Mark all articles in %s as read?" msgstr "" @@ -2492,117 +2492,120 @@ msgid "" "your browser information. Your IP would be saved in the database." msgstr "" -#: js/functions.js:618 +#: js/functions.js:618 js/functions.js:614 msgid "Date syntax appears to be correct:" msgstr "" -#: js/functions.js:621 +#: js/functions.js:621 js/functions.js:617 msgid "Date syntax is incorrect." msgstr "" -#: js/functions.js:748 +#: js/functions.js:748 js/functions.js:744 msgid "Remove stored feed icon?" msgstr "" -#: js/functions.js:780 +#: js/functions.js:780 js/functions.js:776 msgid "Please select an image file to upload." msgstr "" -#: js/functions.js:782 +#: js/functions.js:782 js/functions.js:778 msgid "Upload new icon for this feed?" msgstr "" -#: js/functions.js:799 +#: js/functions.js:799 js/functions.js:795 msgid "Please enter label caption:" msgstr "" -#: js/functions.js:804 +#: js/functions.js:804 js/functions.js:800 msgid "Can't create label: missing caption." msgstr "" -#: js/functions.js:847 +#: js/functions.js:847 js/functions.js:843 msgid "Subscribe to Feed" msgstr "" -#: js/functions.js:874 +#: js/functions.js:874 js/functions.js:870 msgid "Subscribed to %s" msgstr "" -#: js/functions.js:879 +#: js/functions.js:879 js/functions.js:875 msgid "Specified URL seems to be invalid." msgstr "" -#: js/functions.js:882 +#: js/functions.js:882 js/functions.js:878 msgid "Specified URL doesn't seem to contain any feeds." msgstr "" -#: js/functions.js:935 +#: js/functions.js:935 js/functions.js:931 msgid "Couldn't download the specified URL: %s" msgstr "" -#: js/functions.js:939 +#: js/functions.js:939 js/functions.js:935 msgid "You are already subscribed to this feed." msgstr "" -#: js/functions.js:1067 +#: js/functions.js:1067 js/functions.js:1063 msgid "Edit rule" msgstr "" -#: js/functions.js:1093 +#: js/functions.js:1093 js/functions.js:1089 msgid "Edit action" msgstr "" -#: js/functions.js:1130 +#: js/functions.js:1130 js/functions.js:1126 msgid "Create Filter" msgstr "" -#: js/functions.js:1234 +#: js/functions.js:1234 js/functions.js:1230 msgid "" "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification " "hub again on next feed update." msgstr "" -#: js/functions.js:1255 js/tt-rss.js:421 +#: js/functions.js:1255 js/tt-rss.js:421 js/functions.js:1251 msgid "Unsubscribe from %s?" msgstr "" -#: js/functions.js:1362 +#: js/functions.js:1362 js/functions.js:1358 msgid "Please enter category title:" msgstr "" -#: js/functions.js:1393 +#: js/functions.js:1393 js/functions.js:1389 msgid "Generate new syndication address for this feed?" msgstr "" -#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:903 +#: js/functions.js:1584 js/tt-rss.js:400 js/tt-rss.js:903 js/functions.js:1580 +#: js/tt-rss.js:782 msgid "You can't edit this kind of feed." msgstr "" -#: js/functions.js:1599 +#: js/functions.js:1599 js/functions.js:1595 msgid "Edit Feed" msgstr "" -#: js/functions.js:1637 +#: js/functions.js:1637 js/functions.js:1633 msgid "More Feeds" msgstr "" #: js/functions.js:1698 js/functions.js:1808 js/prefs.js:408 js/prefs.js:438 #: js/prefs.js:470 js/prefs.js:653 js/prefs.js:673 js/prefs.js:1326 -#: js/prefs.js:1471 +#: js/prefs.js:1471 js/functions.js:1694 js/functions.js:1804 js/prefs.js:397 +#: js/prefs.js:427 js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 +#: js/prefs.js:1213 js/prefs.js:1358 msgid "No feeds are selected." msgstr "" -#: js/functions.js:1740 +#: js/functions.js:1740 js/functions.js:1736 msgid "" "Remove selected feeds from the archive? Feeds with stored articles will not " "be removed." msgstr "" -#: js/functions.js:1779 +#: js/functions.js:1779 js/functions.js:1775 msgid "Feeds with update errors" msgstr "" -#: js/functions.js:1790 js/prefs.js:1308 +#: js/functions.js:1790 js/prefs.js:1308 js/functions.js:1786 js/prefs.js:1195 msgid "Remove selected feeds?" msgstr "" @@ -2626,89 +2629,92 @@ msgstr "" msgid "Can't create user: no login specified." msgstr "" -#: js/prefs.js:128 +#: js/prefs.js:128 js/prefs.js:117 msgid "Edit Filter" msgstr "" -#: js/prefs.js:175 +#: js/prefs.js:175 js/prefs.js:164 msgid "Remove filter?" msgstr "" -#: js/prefs.js:290 +#: js/prefs.js:290 js/prefs.js:279 msgid "Remove selected labels?" msgstr "" -#: js/prefs.js:306 js/prefs.js:1512 +#: js/prefs.js:306 js/prefs.js:1512 js/prefs.js:295 js/prefs.js:1399 msgid "No labels are selected." msgstr "" -#: js/prefs.js:320 +#: js/prefs.js:320 js/prefs.js:309 msgid "" "Remove selected users? Neither default admin nor your account will be " "removed." msgstr "" #: js/prefs.js:337 js/prefs.js:518 js/prefs.js:539 js/prefs.js:578 +#: js/prefs.js:326 js/prefs.js:507 js/prefs.js:528 js/prefs.js:567 msgid "No users are selected." msgstr "" -#: js/prefs.js:355 +#: js/prefs.js:355 js/prefs.js:344 msgid "Remove selected filters?" msgstr "" -#: js/prefs.js:370 js/prefs.js:608 js/prefs.js:627 +#: js/prefs.js:370 js/prefs.js:608 js/prefs.js:627 js/prefs.js:359 +#: js/prefs.js:597 js/prefs.js:616 msgid "No filters are selected." msgstr "" -#: js/prefs.js:389 +#: js/prefs.js:389 js/prefs.js:378 msgid "Unsubscribe from selected feeds?" msgstr "" -#: js/prefs.js:423 +#: js/prefs.js:423 js/prefs.js:412 msgid "Please select only one feed." msgstr "" -#: js/prefs.js:429 +#: js/prefs.js:429 js/prefs.js:418 msgid "Erase all non-starred articles in selected feed?" msgstr "" -#: js/prefs.js:451 +#: js/prefs.js:451 js/prefs.js:440 msgid "How many days of articles to keep (0 - use default)?" msgstr "" -#: js/prefs.js:489 +#: js/prefs.js:489 js/prefs.js:478 msgid "Login field cannot be blank." msgstr "" -#: js/prefs.js:523 js/prefs.js:544 js/prefs.js:583 +#: js/prefs.js:523 js/prefs.js:544 js/prefs.js:583 js/prefs.js:512 +#: js/prefs.js:533 js/prefs.js:572 msgid "Please select only one user." msgstr "" -#: js/prefs.js:548 +#: js/prefs.js:548 js/prefs.js:537 msgid "Reset password of selected user?" msgstr "" -#: js/prefs.js:613 +#: js/prefs.js:613 js/prefs.js:602 msgid "Please select only one filter." msgstr "" -#: js/prefs.js:631 +#: js/prefs.js:631 js/prefs.js:620 msgid "Combine selected filters?" msgstr "" -#: js/prefs.js:695 +#: js/prefs.js:695 js/prefs.js:684 msgid "Edit Multiple Feeds" msgstr "" -#: js/prefs.js:719 +#: js/prefs.js:719 js/prefs.js:708 msgid "Save changes to selected feeds?" msgstr "" -#: js/prefs.js:811 +#: js/prefs.js:811 js/prefs.js:800 msgid "OPML Import" msgstr "" -#: js/prefs.js:838 +#: js/prefs.js:838 js/prefs.js:827 msgid "Please choose an OPML file first." msgstr "" @@ -2716,81 +2722,81 @@ msgstr "" msgid "Please choose the file first." msgstr "" -#: js/prefs.js:1010 +#: js/prefs.js:1010 js/prefs.js:983 msgid "Reset to defaults?" msgstr "" -#: js/prefs.js:1215 +#: js/prefs.js:1215 js/prefs.js:1102 msgid "" "Remove category %s? Any nested feeds would be placed into Uncategorized." msgstr "" -#: js/prefs.js:1242 +#: js/prefs.js:1242 js/prefs.js:1129 msgid "Remove selected categories?" msgstr "" -#: js/prefs.js:1258 +#: js/prefs.js:1258 js/prefs.js:1145 msgid "No categories are selected." msgstr "" -#: js/prefs.js:1266 +#: js/prefs.js:1266 js/prefs.js:1153 msgid "Category title:" msgstr "" -#: js/prefs.js:1297 +#: js/prefs.js:1297 js/prefs.js:1184 msgid "Feeds without recent updates" msgstr "" -#: js/prefs.js:1346 +#: js/prefs.js:1346 js/prefs.js:1233 msgid "Replace current OPML publishing address with a new one?" msgstr "" -#: js/prefs.js:1455 +#: js/prefs.js:1455 js/prefs.js:1342 msgid "Rescore articles in selected feeds?" msgstr "" -#: js/prefs.js:1478 +#: js/prefs.js:1478 js/prefs.js:1365 msgid "Rescore all articles? This operation may take a lot of time." msgstr "" -#: js/prefs.js:1498 +#: js/prefs.js:1498 js/prefs.js:1385 msgid "Reset selected labels to default colors?" msgstr "" -#: js/prefs.js:1535 +#: js/prefs.js:1535 js/prefs.js:1422 msgid "Settings Profiles" msgstr "" -#: js/prefs.js:1544 +#: js/prefs.js:1544 js/prefs.js:1431 msgid "" "Remove selected profiles? Active and default profiles will not be removed." msgstr "" -#: js/prefs.js:1562 +#: js/prefs.js:1562 js/prefs.js:1449 msgid "No profiles are selected." msgstr "" -#: js/prefs.js:1570 js/prefs.js:1623 +#: js/prefs.js:1570 js/prefs.js:1623 js/prefs.js:1457 js/prefs.js:1510 msgid "Activate selected profile?" msgstr "" -#: js/prefs.js:1586 js/prefs.js:1639 +#: js/prefs.js:1586 js/prefs.js:1639 js/prefs.js:1473 js/prefs.js:1526 msgid "Please choose a profile to activate." msgstr "" -#: js/prefs.js:1647 +#: js/prefs.js:1647 js/prefs.js:1534 msgid "This will invalidate all previously generated feed URLs. Continue?" msgstr "" -#: js/prefs.js:1666 +#: js/prefs.js:1666 js/prefs.js:1553 msgid "This will invalidate all previously shared article URLs. Continue?" msgstr "" -#: js/prefs.js:1764 +#: js/prefs.js:1764 js/prefs.js:1651 msgid "Label Editor" msgstr "" -#: js/prefs.js:1827 +#: js/prefs.js:1827 js/prefs.js:1714 msgid "" "This will clear your stored authentication information for Twitter. Continue?" msgstr "" @@ -2809,7 +2815,7 @@ msgstr "" msgid "Data Import" msgstr "" -#: js/prefs.js:2027 +#: js/prefs.js:2027 js/prefs.js:1794 msgid "Subscribing to feeds..." msgstr "" @@ -2821,19 +2827,19 @@ msgstr "" msgid "You can't unsubscribe from the category." msgstr "" -#: js/tt-rss.js:415 js/tt-rss.js:596 +#: js/tt-rss.js:415 js/tt-rss.js:596 js/tt-rss.js:591 msgid "Please select some feed first." msgstr "" -#: js/tt-rss.js:591 +#: js/tt-rss.js:591 js/tt-rss.js:586 msgid "You can't rescore this kind of feed." msgstr "" -#: js/tt-rss.js:601 +#: js/tt-rss.js:601 js/tt-rss.js:596 msgid "Rescore articles in %s?" msgstr "" -#: js/tt-rss.js:1062 +#: js/tt-rss.js:1062 js/tt-rss.js:883 msgid "New version available!" msgstr "" @@ -2841,100 +2847,115 @@ msgstr "" msgid "Cancel search" msgstr "" -#: js/viewfeed.js:456 +#: js/viewfeed.js:456 js/viewfeed.js:445 msgid "Unstar article" msgstr "" -#: js/viewfeed.js:461 +#: js/viewfeed.js:461 js/viewfeed.js:450 msgid "Star article" msgstr "" -#: js/viewfeed.js:496 +#: js/viewfeed.js:496 js/viewfeed.js:485 msgid "Unpublish article" msgstr "" #: js/viewfeed.js:676 js/viewfeed.js:704 js/viewfeed.js:731 js/viewfeed.js:793 #: js/viewfeed.js:825 js/viewfeed.js:962 js/viewfeed.js:1005 -#: js/viewfeed.js:1055 js/viewfeed.js:2181 +#: js/viewfeed.js:1055 js/viewfeed.js:2181 js/viewfeed.js:665 +#: js/viewfeed.js:693 js/viewfeed.js:720 js/viewfeed.js:782 js/viewfeed.js:814 +#: js/viewfeed.js:951 js/viewfeed.js:994 js/viewfeed.js:1044 +#: js/viewfeed.js:2154 msgid "No articles are selected." msgstr "" -#: js/viewfeed.js:942 +#: js/viewfeed.js:942 js/viewfeed.js:931 msgid "Mark all visible articles in %s as read?" msgstr "" -#: js/viewfeed.js:970 +#: js/viewfeed.js:970 js/viewfeed.js:959 msgid "Delete %d selected articles in %s?" msgstr "" -#: js/viewfeed.js:972 +#: js/viewfeed.js:972 js/viewfeed.js:961 msgid "Delete %d selected articles?" msgstr "" -#: js/viewfeed.js:1014 +#: js/viewfeed.js:1014 js/viewfeed.js:1003 msgid "Archive %d selected articles in %s?" msgstr "" -#: js/viewfeed.js:1017 +#: js/viewfeed.js:1017 js/viewfeed.js:1006 msgid "Move %d archived articles back?" msgstr "" -#: js/viewfeed.js:1061 +#: js/viewfeed.js:1061 js/viewfeed.js:1050 msgid "Mark %d selected articles in %s as read?" msgstr "" -#: js/viewfeed.js:1085 +#: js/viewfeed.js:1085 js/viewfeed.js:1074 msgid "Edit article Tags" msgstr "" -#: js/viewfeed.js:1247 +#: js/viewfeed.js:1247 js/viewfeed.js:1236 msgid "No article is selected." msgstr "" -#: js/viewfeed.js:1282 +#: js/viewfeed.js:1282 js/viewfeed.js:1271 msgid "No articles found to mark" msgstr "" -#: js/viewfeed.js:1284 +#: js/viewfeed.js:1284 js/viewfeed.js:1273 msgid "Mark %d article(s) as read?" msgstr "" -#: js/viewfeed.js:1402 +#: js/viewfeed.js:1402 js/viewfeed.js:1383 msgid "Loading..." msgstr "" -#: js/viewfeed.js:1891 +#: js/viewfeed.js:1891 js/viewfeed.js:1864 msgid "Open original article" msgstr "" -#: js/viewfeed.js:1897 +#: js/viewfeed.js:1897 js/viewfeed.js:1870 msgid "View in a tt-rss tab" msgstr "" -#: js/viewfeed.js:1905 +#: js/viewfeed.js:1905 js/viewfeed.js:1878 msgid "Mark above as read" msgstr "" -#: js/viewfeed.js:1911 +#: js/viewfeed.js:1911 js/viewfeed.js:1884 msgid "Mark below as read" msgstr "" -#: js/viewfeed.js:1967 +#: js/viewfeed.js:1967 js/viewfeed.js:1940 msgid "Remove label" msgstr "" -#: js/viewfeed.js:1991 +#: js/viewfeed.js:1991 js/viewfeed.js:1964 msgid "Playing..." msgstr "" -#: js/viewfeed.js:1992 +#: js/viewfeed.js:1992 js/viewfeed.js:1965 msgid "Click to pause" msgstr "" -#: js/viewfeed.js:2150 +#: js/viewfeed.js:2150 js/viewfeed.js:2123 msgid "Please enter new score for selected articles:" msgstr "" -#: js/viewfeed.js:2192 +#: js/viewfeed.js:2192 js/viewfeed.js:2165 msgid "Please enter new score for this article:" msgstr "" + +#: js/functions.js:1887 +msgid "Help" +msgstr "" + +#: js/prefs.js:1831 +msgid "Clear stored data for this plugin?" +msgstr "" + +#: js/tt-rss.js:741 +msgid "Please enable mail plugin first." +msgstr "" diff --git a/prefs.php b/prefs.php index 575fbbf0..85838861 100644 --- a/prefs.php +++ b/prefs.php @@ -2,8 +2,8 @@ set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR . get_include_path()); - require_once "functions.php"; require_once "sessions.php"; + require_once "functions.php"; require_once "sanity_check.php"; require_once "version.php"; require_once "config.php"; diff --git a/public.php b/public.php index 4cf7653f..7138b3d8 100644 --- a/public.php +++ b/public.php @@ -17,8 +17,8 @@ $_REQUEST = array_map('stripslashes_deep', $_REQUEST); } - require_once "functions.php"; require_once "sessions.php"; + require_once "functions.php"; require_once "sanity_check.php"; require_once "config.php"; require_once "db.php"; -- 2.39.2