aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-08-24 22:42:37 -0700
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-08-24 22:42:37 -0700
commit217bacc66371f41a58cca924bec575102491db35 (patch)
tree6b95c7e88f77d015f1d2c9c098898420d9f96fc6 /tpl
parent83954e711d7f79173db00ad7160f6d1d6a3a9c5d (diff)
parentdb4767e22b9c130bdfe7102383d0f42a2eece490 (diff)
downloadwallabag-217bacc66371f41a58cca924bec575102491db35.tar.gz
wallabag-217bacc66371f41a58cca924bec575102491db35.tar.zst
wallabag-217bacc66371f41a58cca924bec575102491db35.zip
Merge pull request #173 from EliasZ/dev
Graceful error-handling with imports and defining where import files are stored
Diffstat (limited to 'tpl')
-rw-r--r--tpl/config.twig6
1 files changed, 3 insertions, 3 deletions
diff --git a/tpl/config.twig b/tpl/config.twig
index e8563721..89d5bf84 100644
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@ -50,9 +50,9 @@
50 <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p> 50 <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p>
51 <p>{% trans "More infos in the official doc:" %} <a href="http://inthepoche.com/?pages/Documentation">inthepoche.com</a></p> 51 <p>{% trans "More infos in the official doc:" %} <a href="http://inthepoche.com/?pages/Documentation">inthepoche.com</a></p>
52 <ul> 52 <ul>
53 <li><a href="./?import&amp;from=pocket">{% trans "import from Pocket" %}</a> (you must have a "ril_export.html" file on your server)</li> 53 <li><a href="./?import&from=pocket">{% trans "import from Pocket" %}</a> (you must have a "{{ defined('IMPORT_POCKET_FILE') ? constant('IMPORT_POCKET_FILE') ? 'INCORRECT CONFIGURATION' }}" file on your server)</li>
54 <li><a href="./?import&amp;from=readability">{% trans "import from Readability" %}</a> (you must have a "readability" file on your server)</li> 54 <li><a href="./?import&from=readability">{% trans "import from Readability" %}</a> (you must have a "{{ defined('IMPORT_READABILITY_FILE') ? constant('IMPORT_READABILITY_FILE') ? 'INCORRECT CONFIGURATION' }}" file on your server)</li>
55 <li><a href="./?import&amp;from=instapaper">{% trans "import from Instapaper" %}</a> (you must have a "instapaper-export.html" file on your server)</li> 55 <li><a href="./?import&from=instapaper">{% trans "import from Instapaper" %}</a> (you must have a "{{ defined('IMPORT_INSTAPAPER_FILE') ? constant('IMPORT_INSTAPAPER_FILE') ? 'INCORRECT CONFIGURATION' }}" file on your server)</li>
56 </ul> 56 </ul>
57 57
58 <h2>{% trans "Export your poche datas" %}</h2> 58 <h2>{% trans "Export your poche datas" %}</h2>