aboutsummaryrefslogtreecommitdiff
path: root/app/i18n/en/feedback.php
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2020-05-15 17:31:21 +0200
committerGravatar GitHub <noreply@github.com> 2020-05-15 17:31:21 +0200
commit8487fa6248d1d5dac81640de9c55c1eab9f324b3 (patch)
treef3209fdeb8341870bd4fe765e30a0a395a12c4ea /app/i18n/en/feedback.php
parent62a42a20630c5dfb4a677a42bbc3dd6c7cd203d2 (diff)
Reformat i18n correctly (#2976)
* Ignore i18n gen.dir key * Add a makefile target to update an i18n key * Mark some i18n keys to ignore * Reformat i18n files correctly * Make i18n keys sort case-sensitive Calling `make i18n-format` was always inverting 4 lines: - gen.date.dec with gen.date.Dec - and gen.date.nov with gen.date.Nov I don't know why these particular lines and not the others, but it appeared the sort function was case insensitive due to the `SORT_FLAG_CASE` flag passed to the `ksort` function. Removing this flag makes the calls to the formatter idempotent and more reliable. Unfortunately it moves a lot of lines since the `_` character is considered differently. * Check i18n files are correctly formatted on Travis
Diffstat (limited to 'app/i18n/en/feedback.php')
-rw-r--r--app/i18n/en/feedback.php20
1 files changed, 10 insertions, 10 deletions
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index 69987c3b0..606a7ad6a 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -44,9 +44,9 @@ return array(
'ko' => '%s cannot be enabled. <a href="%s">Check FreshRSS logs</a> for details.',
'ok' => '%s is now enabled',
),
+ 'no_access' => 'You have no access on %s',
'not_enabled' => '%s is not enabled',
'not_found' => '%s does not exist',
- 'no_access' => 'You have no access on %s',
),
'import_export' => array(
'export_no_zip_extension' => 'ZIP extension is not present on your server. Please try to export files one by one.',
@@ -72,10 +72,10 @@ return array(
'emptied' => 'Category has been emptied',
'error' => 'Category cannot be updated',
'name_exists' => 'Category name already exists.',
- 'not_delete_default' => 'You cannot delete the default category!',
- 'not_exist' => 'The category does not exist!',
'no_id' => 'You must specify the id of the category.',
'no_name' => 'Category name cannot be empty.',
+ 'not_delete_default' => 'You cannot delete the default category!',
+ 'not_exist' => 'The category does not exist!',
'over_max' => 'You have reached your limit of categories (%d)',
'updated' => 'Category has been updated.',
),
@@ -89,17 +89,17 @@ return array(
'error' => 'Feed cannot be updated',
'internal_problem' => 'The newsfeed could not be added. <a href="%s">Check FreshRSS logs</a> for details. You can try force adding by appending <code>#force_feed</code> to the URL.',
'invalid_url' => 'URL <em>%s</em> is invalid',
- 'not_added' => '<em>%s</em> could not be added',
- 'not_found' => 'Feed cannot be found',
- 'no_refresh' => 'There is no feed to refresh…',
'n_actualized' => '%d feeds have been updated',
'n_entries_deleted' => '%d articles have been deleted',
+ 'no_refresh' => 'There is no feed to refresh…',
+ 'not_added' => '<em>%s</em> could not be added',
+ 'not_found' => 'Feed cannot be found',
'over_max' => 'You have reached your limit of feeds (%d)',
'reloaded' => '<em>%s</em> has been reloaded',
'selector_preview' => array(
'http_error' => 'Failed to load website content.',
'no_entries' => 'There are no articles in this feed. You need at least one article to create a preview.',
- 'no_feed' => 'Internal error (feed can\'t be found).',
+ 'no_feed' => 'Internal error (feed can’t be found).',
'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.',
'selector_empty' => 'The selector is empty. You need to define one to create a preview.',
),
@@ -117,16 +117,16 @@ return array(
),
'user' => array(
'created' => array(
- 'error' => 'User %s cannot be created',
'_' => 'User %s has been created',
+ 'error' => 'User %s cannot be created',
),
'deleted' => array(
- 'error' => 'User %s cannot be deleted',
'_' => 'User %s has been deleted',
+ 'error' => 'User %s cannot be deleted',
),
'updated' => array(
- 'error' => 'User %s has not been updated',
'_' => 'User %s has been updated',
+ 'error' => 'User %s has not been updated',
),
),
);