pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

lots of diverse translation stuff & some typos

Browse Source
This commit is contained in:
Thomas Citharel
2016-02-11 01:42:37 +01:00
parent ae5b37ef2e
commit 4c07a83b69
7 changed files with 64 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Wallabag/ImportBundle/Import/WallabagV2Import.php
View File

@ -27,7 +27,7 @@ class WallabagV2Import extends WallabagV1Import implements ImportInterface
*/
public function getDescription()
{
return 'This importer will import all your wallabag v2 articles. On the export sidebar, click on "JSON". You will have a "Unread articles.json" file.';
return 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.';
}
/**

7
src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
View File

@ -7,7 +7,12 @@
<div class="card-panel settings">
{% if not has_consumer_key %}
<div class="card-panel red darken-1">
{% trans %}Pocket import isn't configured. You need to define pocket_consumer_key.{% endtrans %}
{% trans %}Pocket import isn't configured.{% endtrans %}
{% if is_granted('ROLE_SUPER_ADMIN') %}
{% trans with {'%keyurls%': '<a href="' ~ path('craue_config_settings_modify') ~ '#set-import">', '%keyurle%':'</a>'} %}You need to define %keyurls% a pocket_consumer_key %keyurle%.{% endtrans %}
{% else %}
{% trans %}Your server admin needs to define an API Key for Pocket.{% endtrans %}
{% endif %}
</div>
{% endif %}