diff options
| author | Andrew Dolgov <[email protected]> | 2017-11-20 08:48:28 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2017-11-20 08:48:28 +0300 |
| commit | d2957a271831b88da26bb273367353b35acace37 (patch) | |
| tree | d16a309c527460c601b94e69cf5467991629fc42 | |
| parent | 2352c320c2ed34ec7df1ad22f0c55a1b26489815 (diff) | |
| parent | 99d770ca54a5dcb8e650fa0bb5ab574aabfda14d (diff) | |
Merge branch 'master' of git.fakecake.org:tt-rss
| -rw-r--r-- | include/functions.php | 2 | ||||
| -rw-r--r-- | locale/de_DE/LC_MESSAGES/messages.mo | bin | 64601 -> 64602 bytes | |||
| -rw-r--r-- | locale/de_DE/LC_MESSAGES/messages.po | 2 | ||||
| -rw-r--r-- | plugins/af_comics/init.php | 4 | ||||
| -rw-r--r-- | prefs.php | 1 |
5 files changed, 5 insertions, 4 deletions
diff --git a/include/functions.php b/include/functions.php index f883a12e7..4265692ec 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1663,7 +1663,7 @@ 'caption', 'cite', 'center', 'code', 'col', 'colgroup', 'data', 'dd', 'del', 'details', 'description', 'dfn', 'div', 'dl', 'font', 'dt', 'em', 'footer', 'figure', 'figcaption', - 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'html', 'i', + 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'hr', 'html', 'i', 'img', 'ins', 'kbd', 'li', 'main', 'mark', 'nav', 'noscript', 'ol', 'p', 'pre', 'q', 'ruby', 'rp', 'rt', 's', 'samp', 'section', 'small', 'source', 'span', 'strike', 'strong', 'sub', 'summary', diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo Binary files differindex 7a307dad8..b29dd8322 100644 --- a/locale/de_DE/LC_MESSAGES/messages.mo +++ b/locale/de_DE/LC_MESSAGES/messages.mo diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po index fe549e93d..2c2f11881 100644 --- a/locale/de_DE/LC_MESSAGES/messages.po +++ b/locale/de_DE/LC_MESSAGES/messages.po @@ -3371,7 +3371,7 @@ msgstr "Keine Profile ausgewählt." #: js/prefs.js:1353 js/prefs.js:1406 msgid "Activate selected profile?" -msgstr "Ausgewählte Profile entfernen?" +msgstr "Ausgewählte Profile aktivieren?" #: js/prefs.js:1370 js/prefs.js:1422 msgid "Please choose a profile to activate." diff --git a/plugins/af_comics/init.php b/plugins/af_comics/init.php index 6bd3c23e2..54054399e 100644 --- a/plugins/af_comics/init.php +++ b/plugins/af_comics/init.php @@ -65,7 +65,7 @@ class Af_Comics extends Plugin { } print "</ul>"; - print "<p>".__('GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>).')."</p>"; + print "<p>".__("To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>).")."</p>"; print "<p>".__('Drop any updated filters into <code>filters.local</code> in plugin directory.')."</p>"; @@ -89,7 +89,7 @@ class Af_Comics extends Plugin { if ($auth_login || $auth_pass) return $feed_data; - if (preg_match('#^https?://feeds.feedburner.com/uclick/([-a-z]+)#', $fetch_url, $comic)) { + if (preg_match('#^https?://(?:feeds\.feedburner\.com/uclick|www\.gocomics\.com)/([-a-z0-9]+)$#i', $fetch_url, $comic)) { $site_url = 'http://www.gocomics.com/' . $comic[1]; $article_link = $site_url . date('/Y/m/d'); @@ -31,6 +31,7 @@ <html> <head> <title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title> + <meta name="viewport" content="initial-scale=1,width=device-width" /> <script type="text/javascript"> var __ttrss_version = "<?php echo VERSION ?>" |