diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-03-09 08:59:08 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-03-20 21:12:22 +0100 |
commit | 0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc (patch) | |
tree | 4cf8b97ed3c06def270e9172c7b17c5c86048585 /src/Wallabag/ImportBundle/Import | |
parent | d2b4f01d7435e8a8f99b15a2487916427c04e58d (diff) | |
download | wallabag-0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc.tar.gz wallabag-0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc.tar.zst wallabag-0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc.zip |
Convert english translation file
- convert english translation to translate key
- remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material)
- fix tests about text in response (now checking translation key instead of translated text)
- remove all ugly `<div class="hidden">{{ form_rest(form) }}</div>`
Diffstat (limited to 'src/Wallabag/ImportBundle/Import')
-rw-r--r-- | src/Wallabag/ImportBundle/Import/PocketImport.php | 4 | ||||
-rw-r--r-- | src/Wallabag/ImportBundle/Import/WallabagV1Import.php | 2 | ||||
-rw-r--r-- | src/Wallabag/ImportBundle/Import/WallabagV2Import.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php index 238ddbd1..4499ce69 100644 --- a/src/Wallabag/ImportBundle/Import/PocketImport.php +++ b/src/Wallabag/ImportBundle/Import/PocketImport.php | |||
@@ -60,7 +60,7 @@ class PocketImport implements ImportInterface | |||
60 | */ | 60 | */ |
61 | public function getDescription() | 61 | public function getDescription() |
62 | { | 62 | { |
63 | return 'This importer will import all your Pocket data. Pocket doesn\'t allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag.'; | 63 | return 'import.pocket.description'; |
64 | } | 64 | } |
65 | 65 | ||
66 | /** | 66 | /** |
@@ -139,7 +139,7 @@ class PocketImport implements ImportInterface | |||
139 | /** | 139 | /** |
140 | * Get whether articles must be all marked as read. | 140 | * Get whether articles must be all marked as read. |
141 | */ | 141 | */ |
142 | public function getRead() | 142 | public function getMarkAsRead() |
143 | { | 143 | { |
144 | return $this->markAsRead; | 144 | return $this->markAsRead; |
145 | } | 145 | } |
diff --git a/src/Wallabag/ImportBundle/Import/WallabagV1Import.php b/src/Wallabag/ImportBundle/Import/WallabagV1Import.php index 1d773d3b..173a587f 100644 --- a/src/Wallabag/ImportBundle/Import/WallabagV1Import.php +++ b/src/Wallabag/ImportBundle/Import/WallabagV1Import.php | |||
@@ -67,7 +67,7 @@ class WallabagV1Import implements ImportInterface | |||
67 | */ | 67 | */ |
68 | public function getDescription() | 68 | public function getDescription() |
69 | { | 69 | { |
70 | return 'This importer will import all your wallabag v1 articles. On your config page, click on "JSON export" in the "Export your wallabag data" section. You will have a "wallabag-export-1-xxxx-xx-xx.json" file.'; | 70 | return 'import.wallabag_v1.description'; |
71 | } | 71 | } |
72 | 72 | ||
73 | /** | 73 | /** |
diff --git a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php index c4bac561..0a32864e 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. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.'; | 30 | return 'import.wallabag_v2.description'; |
31 | } | 31 | } |
32 | 32 | ||
33 | /** | 33 | /** |