diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-02-11 01:42:37 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2016-02-11 01:42:37 +0100 |
commit | 4c07a83b6911852b69ebb0b55b6608b6563b8712 (patch) | |
tree | 2501d38841f64c264eb09197c9d9104b78865517 /src/Wallabag/ImportBundle | |
parent | ae5b37ef2e52c06182bc6edb14f6b3aae381ddb4 (diff) | |
download | wallabag-4c07a83b6911852b69ebb0b55b6608b6563b8712.tar.gz wallabag-4c07a83b6911852b69ebb0b55b6608b6563b8712.tar.zst wallabag-4c07a83b6911852b69ebb0b55b6608b6563b8712.zip |
lots of diverse translation stuff & some typos
Diffstat (limited to 'src/Wallabag/ImportBundle')
-rw-r--r-- | src/Wallabag/ImportBundle/Import/WallabagV2Import.php | 2 | ||||
-rw-r--r-- | src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php index c5c0d5a7..7125eabc 100644 --- a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php +++ b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php | |||
@@ -27,7 +27,7 @@ class WallabagV2Import extends WallabagV1Import implements ImportInterface | |||
27 | */ | 27 | */ |
28 | public function getDescription() | 28 | public function getDescription() |
29 | { | 29 | { |
30 | 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.'; | 30 | 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.'; |
31 | } | 31 | } |
32 | 32 | ||
33 | /** | 33 | /** |
diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig index e0e36f38..8aa5da97 100644 --- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig +++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig | |||
@@ -7,7 +7,12 @@ | |||
7 | <div class="card-panel settings"> | 7 | <div class="card-panel settings"> |
8 | {% if not has_consumer_key %} | 8 | {% if not has_consumer_key %} |
9 | <div class="card-panel red darken-1"> | 9 | <div class="card-panel red darken-1"> |
10 | {% trans %}Pocket import isn't configured. You need to define pocket_consumer_key.{% endtrans %} | 10 | {% trans %}Pocket import isn't configured.{% endtrans %} |
11 | {% if is_granted('ROLE_SUPER_ADMIN') %} | ||
12 | {% 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 %} | ||
13 | {% else %} | ||
14 | {% trans %}Your server admin needs to define an API Key for Pocket.{% endtrans %} | ||
15 | {% endif %} | ||
11 | </div> | 16 | </div> |
12 | {% endif %} | 17 | {% endif %} |
13 | 18 | ||