From b1bfd4cb0c06bb7fd730d634a57325dc34cfb407 Mon Sep 17 00:00:00 2001
From: William Theaker <william.theaker@gmail.com>
Date: Thu, 2 Jan 2014 21:04:56 -0500
Subject: [PATCH 1/2] Updated tag edit page
---
themes/default/edit-tags.twig | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig
index 7116bba9f..53852d392 100644
--- a/themes/default/edit-tags.twig
+++ b/themes/default/edit-tags.twig
@@ -11,10 +11,10 @@ no tags
{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&tag_id={{ tag.id }}&id={{ entry_id }}">✘</a></li>{% endfor %}
</ul>
<form method="post" action="./?action=add_tag">
- <label for="value">New tags: </label><input type="text" id="value" name="value" required="required" />
- <p>{% trans "you can type several tags, separated by comma" %}</p>
+ <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
+ <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
<input type="hidden" name="entry_id" value="{{ entry_id }}" />
- <input type="submit" value="add tags" />
+ <input type="submit" value="Tag" />
</form>
-<a href="./?view=view&id={{ entry_id }}">{% trans "back to the article" %}</a>
-{% endblock %}
\ No newline at end of file
+<a href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a>
+{% endblock %}
From aeea7c6af02d02cfed077eeab1b7fe34a4d4c5db Mon Sep 17 00:00:00 2001
From: William Theaker <william.theaker@gmail.com>
Date: Thu, 2 Jan 2014 21:15:41 -0500
Subject: [PATCH 2/2] Updated config page
---
themes/default/config.twig | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/themes/default/config.twig b/themes/default/config.twig
index c01556ba8..10df726e0 100644
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -6,11 +6,11 @@
{% endblock %}
{% block content %}
<h2>{% trans "Poching links" %}</h2>
- <p>{% trans "There are several ways to poche a link::" %} (<a href="http://doc.inthepoche.com/" title="{% trans "read the documentation" %}">?</a>)</p>
+ <p>{% trans "There are several ways to poche a link:" %} (<a href="http://doc.inthepoche.com/" title="{% trans "read the documentation" %}">?</a>)</p>
<ul>
<li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/poche/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
<li>Chrome: <a href="http://doc.inthepoche.com/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
- <li>Android: <a href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via f-droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
+ <li>Android: <a href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
<li>Windows Phone: <a href="https://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li>
<li>
<form method="get" action="index.php">
@@ -31,12 +31,12 @@
<h2>{% trans "Feeds" %}</h2>
{% if token == '' %}
- <p>{% trans "The token is empty, you have to generate it to use feeds. Click <a href='?feed&action=generate'>here to generate it</a>." %}</p>
+ <p>{% trans "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&action=generate'>here to generate it</a>." %}</p>
{% else %}
<ul>
- <li><a href="?feed&type=home&user_id={{ user_id }}&token={{ token }}" target="_blank">{% trans "unread feed" %}</a></li>
- <li><a href="?feed&type=fav&user_id={{ user_id }}&token={{ token }}" target="_blank">{% trans "favorites feed" %}</a></li>
- <li><a href="?feed&type=archive&user_id={{ user_id }}&token={{ token }}" target="_blank">{% trans "archive feed" %}</a></li>
+ <li><a href="?feed&type=home&user_id={{ user_id }}&token={{ token }}" target="_blank">{% trans "Unread feed" %}</a></li>
+ <li><a href="?feed&type=fav&user_id={{ user_id }}&token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li>
+ <li><a href="?feed&type=archive&user_id={{ user_id }}&token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li>
</ul>
<p>{% trans "You can regenerate your token: <a href='?feed&action=generate'>generate!</a>." %}</p>
{% endif %}
@@ -101,12 +101,12 @@
{% endif %}
<h2>{% trans "Import" %}</h2>
- <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p>
- <p>{% trans "More info in the official docs:" %} <a href="http://doc.inthepoche.com/">inthepoche.com</a></p>
+ <p>{% trans "Please execute the import script locally as it can take a very long time." %}</p>
+ <p>{% trans "More info in the official docs:" %} <a href="http://doc.inthepoche.com/doku.php?id=users:migrate">inthepoche.com</a></p>
<ul>
- <li><a href="./?import&from=pocket">{% trans "import from Pocket" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCKET_FILE')) }}</li>
- <li><a href="./?import&from=readability">{% trans "import from Readability" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('READABILITY_FILE')) }}</li>
- <li><a href="./?import&from=instapaper">{% trans "import from Instapaper" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('INSTAPAPER_FILE')) }}</li>
+ <li><a href="./?import&from=pocket">{% trans "Import from Pocket" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCKET_FILE')) }}</li>
+ <li><a href="./?import&from=readability">{% trans "Import from Readability" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('READABILITY_FILE')) }}</li>
+ <li><a href="./?import&from=instapaper">{% trans "Import from Instapaper" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('INSTAPAPER_FILE')) }}</li>
</ul>
<h2>{% trans "Export your poche data" %}</h2>