@@ -14,6 +14,17 @@
<input class="text nowidth" type="text" name="posts_per_page" value="${ site.posts_per_page | escape }" size="2" id="posts_per_page" />
</p>
<p>
+ <label for="feed_url">${ "Feed URL" | translate }</label>
+ <input class="text" type="text" name="feed_url" value="${ site.feed_url | escape }" id="feed_url" />
+ <small>
+ {% if site.clean_urls %}
+ ${ "Allows you to set an alternative URL for <code>/feed/</code>, e.g. your feed on FeedBurner." | translate }
+ {% else %}
+ ${ "Allows you to set an alternative URL for <code>/?feed</code>, e.g. your feed on FeedBurner." | translate }
+ {% endif %}
+ </small>
+ </p>
+ <p>
<label for="feed_items">${ "Feed Posts Limit" | translate }</label>
<input class="text nowidth" type="text" name="feed_items" value="${ site.feed_items | escape }" size="2" id="feed_items" />
</p>
admin/layout/pages/content_settings.twig
@@ -18,8 +18,8 @@
<textarea name="description" rows="2" cols="40">${ site.description | escape }</textarea>
</p>
<p>
- <label for="url">${ "Chyrp URL" | translate }</label>
- <input class="text" type="text" name="chyrp_url" value="${ site.chyrp_url | escape }" id="url" />
+ <label for="chyrp_url">${ "Chyrp URL" | translate }</label>
+ <input class="text" type="text" name="chyrp_url" value="${ site.chyrp_url | escape }" id="chyrp_url" />
</p>
<p>
<label for="url">${ "Alternate URL" | translate }</label>
admin/layout/pages/general_settings.twig
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
feathers/audio/locale/en_US.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
feathers/chat/locale/en_US.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
feathers/link/locale/en_US.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
feathers/photo/locale/en_US.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
feathers/quote/locale/en_US.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
feathers/text/locale/en_US.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
feathers/video/locale/en_US.pot
@@ -252,7 +252,7 @@
'&title='.urlencode($this->title) ;
$route = Route::current();
- $feeds = '<link rel="alternate" type="application/atom+xml" title="'.$config->name.' Feed" href="'.$route->url("feed/").'" />'."\n";
+ $feeds = '<link rel="alternate" type="application/atom+xml" title="'.$config->name.' Feed" href="'.fallback($config->feed_url, $route->url("feed/"), true).'" />'."\n";
foreach ($pluralizations["feathers"] as $normal => $plural) {
$feeds.= "\t\t".'<link rel="alternate" type="application/atom+xml" title="'.ucfirst($plural).' Feed" href="'.$route->url($plural."/feed/".urlencode(ucfirst($plural))."/").'" />'."\n";
includes/class/Theme.php
@@ -334,5 +334,5 @@
elseif (isset($posts)) # Are there already posts to show?
$route->action = "feed";
else
- redirect($route->url("feed/")); # Really? Nothing? Too bad. MAIN FEED 4 U.
+ redirect(fallback($config->feed_url, $route->url("feed/"), true)); # Really? Nothing? Too bad. MAIN FEED 4 U.
}
includes/common.php
@@ -1147,6 +1147,7 @@
$config = Config::current();
$config->set("feed_items", $_POST['feed_items']);
+ $config->set("feed_url", $_POST['feed_url']);
$config->set("enable_trackbacking", !empty($_POST['enable_trackbacking']));
$config->set("send_pingbacks", !empty($_POST['send_pingbacks']));
$config->set("posts_per_page", $_POST['posts_per_page']);
includes/controller/Admin.php
@@ -89,7 +89,7 @@
*/
public function rss() {
header("HTTP/1.1 301 Moved Permanently");
- redirect(Route::current()->url("feed/"));
+ redirect(fallback(Config::current()->feed_url, Route::current()->url("feed/"), true));
}
/**
includes/controller/Main.php
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
@@ -187,8 +187,8 @@ msgstr ""
#: includes/controller/Admin.php:1073
#: includes/controller/Admin.php:1113
#: includes/controller/Admin.php:1138
-#: includes/controller/Admin.php:1163
-#: includes/controller/Admin.php:1186
+#: includes/controller/Admin.php:1164
+#: includes/controller/Admin.php:1187
msgid "You do not have sufficient privileges to change settings."
msgstr ""
@@ -206,7 +206,7 @@ msgstr ""
msgid "STOP! Before you go any further, you must create a .htaccess file in Chyrp's install directory and put this in it:\n<pre>%s</pre>"
msgstr ""
-#: admin/layout/pages/content_settings.twig:21
+#: admin/layout/pages/content_settings.twig:32
msgid "Enable Trackbacking"
msgstr ""
@@ -323,7 +323,7 @@ msgstr ""
msgid "Please enter a valid year and month."
msgstr ""
-#: includes/controller/Admin.php:1188
+#: includes/controller/Admin.php:1189
msgid "No Theme Specified"
msgstr ""
@@ -499,6 +499,10 @@ msgstr ""
msgid "Content"
msgstr ""
+#: admin/layout/pages/content_settings.twig:17
+msgid "Feed URL"
+msgstr ""
+
#: admin/layout/pages/manage_users.twig:11
msgid "User deleted."
msgstr ""
@@ -601,7 +605,7 @@ msgstr ""
msgid "Post has been saved as a draft."
msgstr ""
-#: admin/layout/pages/content_settings.twig:31
+#: admin/layout/pages/content_settings.twig:42
msgid "Attempts to notify sites linked to from your posts. It'll slow down things a bit when you submit them, depending on how many links you've got in it."
msgstr ""
@@ -1091,7 +1095,7 @@ msgstr ""
#: includes/controller/Admin.php:1093
#: includes/controller/Admin.php:1122
#: includes/controller/Admin.php:1146
-#: includes/controller/Admin.php:1171
+#: includes/controller/Admin.php:1172
msgid "Invalid security key."
msgstr ""
@@ -1099,7 +1103,7 @@ msgstr ""
msgid "(usually ok as \"localhost\")"
msgstr ""
-#: includes/controller/Admin.php:1242
+#: includes/controller/Admin.php:1243
msgid "You do not have sufficient privileges to access this area."
msgstr ""
@@ -1238,6 +1242,14 @@ msgstr ""
msgid "Importing from WordPress requires the Text feather to be installed and enabled."
msgstr ""
+#: admin/layout/pages/content_settings.twig:23
+msgid "Allows you to set an alternative URL for <code>/?feed</code>, e.g. your feed on FeedBurner."
+msgstr ""
+
+#: admin/layout/pages/content_settings.twig:21
+msgid "Allows you to set an alternative URL for <code>/feed/</code>, e.g. your feed on FeedBurner."
+msgstr ""
+
#: install.php:478
msgid "My Awesome Site"
msgstr ""
@@ -1377,7 +1389,7 @@ msgstr ""
msgid "Extend"
msgstr ""
-#: admin/layout/pages/content_settings.twig:17
+#: admin/layout/pages/content_settings.twig:28
msgid "Feed Posts Limit"
msgstr ""
@@ -1405,7 +1417,7 @@ msgstr ""
msgid "Please enter a name for your website."
msgstr ""
-#: includes/controller/Admin.php:1188
+#: includes/controller/Admin.php:1189
msgid "You did not specify a theme to switch to."
msgstr ""
@@ -1551,7 +1563,7 @@ msgstr ""
msgid "Table Prefix"
msgstr ""
-#: admin/layout/pages/content_settings.twig:24
+#: admin/layout/pages/content_settings.twig:35
msgid "Trackbacking allows sites to notify you when they write a new entry, usually because they link to or reference yours."
msgstr ""
@@ -1635,7 +1647,7 @@ msgstr ""
#: admin/layout/pages/general_settings.twig:54
#: admin/layout/pages/edit_user.twig:49
#: admin/layout/pages/edit_group.twig:29
-#: admin/layout/pages/content_settings.twig:36
+#: admin/layout/pages/content_settings.twig:47
msgid "Update"
msgstr ""
@@ -1771,7 +1783,7 @@ msgstr ""
msgid "Lost Password"
msgstr ""
-#: admin/layout/pages/content_settings.twig:28
+#: admin/layout/pages/content_settings.twig:39
msgid "Send Pingbacks"
msgstr ""
@@ -1906,10 +1918,10 @@ msgstr ""
#: includes/controller/Admin.php:1122
#: includes/controller/Admin.php:1138
#: includes/controller/Admin.php:1146
-#: includes/controller/Admin.php:1163
-#: includes/controller/Admin.php:1171
-#: includes/controller/Admin.php:1186
-#: includes/controller/Admin.php:1242
+#: includes/controller/Admin.php:1164
+#: includes/controller/Admin.php:1172
+#: includes/controller/Admin.php:1187
+#: includes/controller/Admin.php:1243
#: includes/common.php:304
#: includes/bookmarklet.php:5
#: includes/ajax.php:13
includes/locale/en_US.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
modules/cacher/locale/en_US.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
modules/comments/locale/en_US.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
modules/markdown/locale/en_US.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
modules/paging/locale/en_US.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
modules/read_more/locale/en_US.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
modules/rss/locale/en_US.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
modules/smartypants/locale/en_US.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
modules/tags/locale/en_US.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
modules/textilize/locale/en_US.pot
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
modules/wpformatting/locale/en_US.pot
@@ -45,7 +45,7 @@ ${ trigger.call("head") }
$posts.prev_link
<br />
<div class="footer">
- <p><a href="{% url "feed/" %}">Feed</a> / theme © <a href="http://lofisoami.com/">Aaron MacDonald</a> 2007</p>
+ <p>theme © <a href="http://lofisoami.com/">Aaron MacDonald</a> 2007</p>
<span>${ "Powered by <a href=\"http://chyrp.net/\">Chyrp</a>" | translate }</span>
</div>
</div>
themes/default/layouts/default.twig
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Chyrp v2.0 Beta 3\n"
"Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n"
"POT-Creation-Date: 2007-08-03 00:29-0500\n"
-"PO-Revision-Date: 2008-06-30 19:55-0500\n"
+"PO-Revision-Date: 2008-06-30 20:40-0500\n"
"Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n"
"Language-Team: English (en) <suracil.icio.us@gmail.com>\n"
"MIME-Version: 1.0\n"
themes/default/locale/en_US.pot
4f6a2d90bd766d594fb977ab223c02d35c61f4b9
Alex Suraci
i.am@toogeneric.com
http://github.com/vito/chyrp/commit/1eb788cbc437c332d6fff3af11cdf0075107305f
1eb788cbc437c332d6fff3af11cdf0075107305f
2008-06-30T17:41:44-07:00
2008-06-30T17:41:44-07:00
Added feed_url setting, for specifying alternate URLs to /feed/ or /?feed (like FeedBurner). Removed link from the theme, since it's in the <head> anyway.
ce13bf406b29daf2faf1297868ed2a24a9ffbb99
Alex Suraci
i.am@toogeneric.com