Skip to content

GitLab

Commit 9878284f authored by Tails developers's avatar Tails developers
Browse files
Options

Make the news section translatable. 

Add RewriteRule's for the two kinds of RSS and Atom feeds generated from the
news index page.
parent 2c9fa542
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 75 deletions
ikiwiki-cgi.setup
View file @ 9878284f
......@@ -225,7 +225,7 @@ po_slave_languages:
- fr|Français
- pt|Português
# PageSpec controlling which pages are translatable
po_translatable_pages: '!security/audits and !security/audits/* and (about or chat or contribute or doc or doc/* or download or getting_started or inc/stable_i386_date or index or news or security or security/* or sidebar or support or support/* or torrents or wishlist)'
po_translatable_pages: '!security/audits and !security/audits/* and (about or chat or contribute or doc or doc/* or download or getting_started or inc/stable_i386_date or index or news or news/* or security or security/* or sidebar or support or support/* or torrents or wishlist)'
# internal linking behavior (default/current/negotiated)
po_link_to: current
......
ikiwiki.setup
View file @ 9878284f
......@@ -201,7 +201,7 @@ po_slave_languages:
- fr|Français
- pt|Português
# PageSpec controlling which pages are translatable
po_translatable_pages: '!security/audits and !security/audits/* and (about or chat or contribute or doc or doc/* or download or getting_started or inc/stable_i386_date or index or news or security or security/* or sidebar or support or support/* or torrents or wishlist or misc or misc/*)'
po_translatable_pages: '!security/audits and !security/audits/* and (about or chat or contribute or doc or doc/* or download or getting_started or inc/stable_i386_date or index or news or news/* or security or security/* or sidebar or support or support/* or torrents or wishlist or misc or misc/*)'
# internal linking behavior (default/current/negotiated)
po_link_to: current
......
wiki/src/index.de.po
View file @ 9878284f
......@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2011-11-20 16:40+0100\n"
"PO-Revision-Date: 2011-06-13 19:01+0200\n"
"POT-Creation-Date: 2012-11-15 02:51+0100\n"
"PO-Revision-Date: 2012-11-15 03:48+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
......@@ -76,11 +76,9 @@ msgstr "Aktuelles"
#. type: Content of: <div><div>
msgid ""
"[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"2\" "
"feeds=\"no\" archive=\"yes\"]]"
msgstr ""
"[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"2\" "
"feeds=\"no\" archive=\"yes\"]]"
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang"
"()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
#. type: Content of: <div><div><p>
msgid "See [[News]] for more."
......@@ -91,21 +89,12 @@ msgid "security"
msgstr "Sicherheit"
#. type: Content of: <div><div>
#, fuzzy
#| msgid ""
#| "[[!inline pages=\"security/* and !security/audits and !security/audits.* "
#| "and !security/audits/* and !security/*/* and !security/discussion and "
#| "currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
msgid ""
"[[!inline pages=\"security/* and !security/audits and !security/audits.* and !"
"security/audits/* and !security/*/* and !security/discussion and currentlang"
"()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
msgstr ""
"[[!inline pages=\"security/* and !security/audits and !security/audits.* and !"
"security/audits/* and !security/*/* and !security/discussion and currentlang"
"()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
"[[!inline pages=\"security/* and !security/audits and !security/audits.* "
"and !security/audits/* and !security/*/* and !security/discussion and "
"currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
msgstr "[[!inline pages=\"security/* and !security/audits and !security/audits.* and !security/audits/* and !security/*/* and !security/discussion and currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
#. type: Content of: <div><div><p>
msgid "See [[Security]] for more."
msgstr "Mehr unter [[Sicherheitshinweise|Security]]."
wiki/src/index.es.po
View file @ 9878284f
......@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: tails-index-es\n"
"POT-Creation-Date: 2012-02-13 10:18+0100\n"
"PO-Revision-Date: 2011-10-08 17:44+0200\n"
"POT-Creation-Date: 2012-11-15 02:51+0100\n"
"PO-Revision-Date: 2012-11-15 03:48+0100\n"
"Last-Translator: \n"
"Language-Team: nada-es <LL@li.org>\n"
"Language: \n"
......@@ -76,11 +76,9 @@ msgstr "Noticias"
#. type: Content of: <div><div>
msgid ""
"[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"2\" "
"feeds=\"no\" archive=\"yes\"]]"
msgstr ""
"[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"2\" "
"feeds=\"no\" archive=\"yes\"]]"
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang"
"()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
#. type: Content of: <div><div><p>
msgid "See [[News]] for more."
......
wiki/src/index.fr.po
View file @ 9878284f
......@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: tails-index-fr\n"
"POT-Creation-Date: 2011-12-24 12:01+0100\n"
"PO-Revision-Date: 2012-10-04 12:47-0000\n"
"POT-Creation-Date: 2012-11-15 02:51+0100\n"
"PO-Revision-Date: 2012-11-15 03:48+0100\n"
"Last-Translator: \n"
"Language-Team: nada-fr <LL@li.org>\n"
"Language: \n"
......@@ -78,11 +78,9 @@ msgstr "nouvelles"
#. type: Content of: <div><div>
msgid ""
"[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"2\" "
"feeds=\"no\" archive=\"yes\"]]"
msgstr ""
"[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"2\" "
"feeds=\"no\" archive=\"yes\"]]"
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang"
"()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
#. type: Content of: <div><div><p>
msgid "See [[News]] for more."
......@@ -94,13 +92,13 @@ msgstr "sécurité"
#. type: Content of: <div><div>
msgid ""
"[[!inline pages=\"security/* and !security/audits and !security/audits.* and !"
"security/audits/* and !security/*/* and !security/discussion and currentlang"
"()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
"[[!inline pages=\"security/* and !security/audits and !security/audits.* "
"and !security/audits/* and !security/*/* and !security/discussion and "
"currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
msgstr ""
"[[!inline pages=\"security/* and !security/audits and !security/audits.* and !"
"security/audits/* and !security/*/* and !security/discussion and currentlang"
"()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
"[[!inline pages=\"security/* and !security/audits and !security/audits.* "
"and !security/audits/* and !security/*/* and !security/discussion and "
"currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
#. type: Content of: <div><div><p>
msgid "See [[Security]] for more."
......
wiki/src/index.html
View file @ 9878284f
......@@ -37,7 +37,7 @@ class="definition">[[!wikipedia live_USB]]</span> that aims at preserving your
<h1>news</h1>
[[!inline pages="news/* and !news/*/* and !news/discussion" show="2" feeds="no" archive="yes"]]
[[!inline pages="news/* and !news/*/* and !news/discussion and currentlang()" show="2" feeds="no" archive="yes"]]
<p>See [[News]] for more.</p>
......
wiki/src/index.pt.po
View file @ 9878284f
......@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: tails-index-pt\n"
"POT-Creation-Date: 2012-06-29 22:42-0300\n"
"PO-Revision-Date: 2012-07-03 10:30-0300\n"
"POT-Creation-Date: 2012-11-15 02:51+0100\n"
"PO-Revision-Date: 2012-11-15 03:48+0100\n"
"Last-Translator: drebs <drebs@riseup.net>\n"
"Language-Team: Portuguese <LL@li.org>\n"
"Language: \n"
......@@ -53,8 +53,10 @@ msgid "news"
msgstr "Notícias"
#. type: Content of: <div><div>
msgid "[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
msgid ""
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang"
"()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
#. type: Content of: <div><div><p>
msgid "See [[News]] for more."
......@@ -65,8 +67,14 @@ msgid "security"
msgstr "Segurança"
#. type: Content of: <div><div>
msgid "[[!inline pages=\"security/* and !security/audits and !security/audits.* and !security/audits/* and !security/*/* and !security/discussion and currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
msgstr "[[!inline pages=\"security/* and !security/audits and !security/audits.* and !security/audits/* and !security/*/* and !security/discussion and currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
msgid ""
"[[!inline pages=\"security/* and !security/audits and !security/audits.* "
"and !security/audits/* and !security/*/* and !security/discussion and "
"currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
msgstr ""
"[[!inline pages=\"security/* and !security/audits and !security/audits.* "
"and !security/audits/* and !security/*/* and !security/discussion and "
"currentlang()\" show=\"2\" feeds=\"no\" archive=\"yes\"]]"
#. type: Content of: <div><div><p>
msgid "See [[Security]] for more."
......
wiki/src/news.de.po
View file @ 9878284f
......@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2012-08-28 14:28+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"POT-Creation-Date: 2012-11-15 02:51+0100\n"
"PO-Revision-Date: 2012-11-15 03:50+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
......@@ -34,16 +34,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"30\"]]\n"
msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"30\"]]\n"
msgid "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"30\"]]\n"
msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"30\"]]\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"30\"]]\n"
#, no-wrap
msgid ""
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and tagged(announce)\"\n"
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
" show=\"30\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
msgstr ""
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
" show=\"30\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"30\"]]\n"
#. type: Plain text
msgid ""
......
wiki/src/news.es.po
View file @ 9878284f
......@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2012-08-28 14:28+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"POT-Creation-Date: 2012-11-15 02:51+0100\n"
"PO-Revision-Date: 2012-11-15 03:50+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
......@@ -31,15 +31,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"30\"]]\n"
msgstr ""
msgid "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"30\"]]\n"
msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"30\"]]\n"
#. type: Plain text
#, no-wrap
msgid ""
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and tagged(announce)\"\n"
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
" show=\"30\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
msgstr ""
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
" show=\"30\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
#. type: Plain text
msgid ""
......
wiki/src/news.fr.po
View file @ 9878284f
......@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2011-04-30 17:24-0600\n"
"PO-Revision-Date: 2012-10-04 12:46-0000\n"
"POT-Creation-Date: 2012-11-15 02:51+0100\n"
"PO-Revision-Date: 2012-11-15 03:50+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
......@@ -34,16 +34,16 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"30\"]]\n"
msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"30\"]]\n"
msgid "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"30\"]]\n"
msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"30\"]]\n"
#. type: Plain text
#, no-wrap
msgid ""
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and tagged(announce)\"\n"
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
" show=\"30\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
msgstr ""
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and tagged(announce)\"\n"
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
" show=\"30\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
#. type: Plain text
......
wiki/src/news.mdwn
View file @ 9878284f
......@@ -6,8 +6,8 @@ recommended to subscribe to this page's RSS feed or to the
[amnesia-news
mailing-list](https://boum.org/mailman/listinfo/amnesia-news).
[[!inline pages="news/* and !news/*/* and !news/discussion" show="30"]]
[[!inline pages="news/* and !news/*/* and !news/discussion and tagged(announce)"
[[!inline pages="news/* and !news/*/* and !news/discussion and currentlang()" show="30"]]
[[!inline pages="news/* and !news/*/* and !news/discussion and currentlang() and tagged(announce)"
show="30" feeds="yes" feedonly="yes" feedfile="emails"]]
By the way, some other pages with RSS feeds include [[TODO]] and
......
wiki/src/news.pt.po
View file @ 9878284f
......@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2012-08-28 14:28+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"POT-Creation-Date: 2012-11-15 02:51+0100\n"
"PO-Revision-Date: 2012-11-15 03:50+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
......@@ -35,15 +35,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"30\"]]\n"
msgstr ""
msgid "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"30\"]]\n"
msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang()\" show=\"30\"]]\n"
#. type: Plain text
#, no-wrap
msgid ""
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and tagged(announce)\"\n"
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
" show=\"30\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
msgstr ""
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and currentlang() and tagged(announce)\"\n"
" show=\"30\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
#. type: Plain text
msgid ""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment