72 Commits

Author SHA1 Message Date
Robert Schäfer
9987ad1c95 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into 37-full-text-search-top-bar 2019-03-18 15:08:31 +01:00
Robert Schäfer
f33f3a4d16 Report/disable message shows data of the resource 2019-03-15 19:56:21 +01:00
Robert Schäfer
fc244cd098 More honest translations 2019-03-14 23:21:19 +01:00
Robert Schäfer
c2d7002795 Translations 2019-03-14 02:11:17 +01:00
Grzegorz Leoniec
ab09f356ca
Fixed a submit buttion translation for reporting content 2019-03-12 17:59:40 +01:00
Grzegorz Leoniec
370734bdde
Merged master in, fixed translation and modal linting issues 2019-03-12 17:58:04 +01:00
Matt Rider
85ffd67a49 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into 37-full-text-search-top-bar 2019-03-12 12:49:48 -03:00
Robert Schäfer
3b7ffde4c2 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into get_rid_of_resource_type 2019-03-12 13:26:56 +01:00
mattwr18
56531dab62
Merge branch 'master' into 37-full-text-search-top-bar 2019-03-12 08:31:45 -03:00
lokalise-bot
d1be013c3c Lokalise: update of locales/pt.json 2019-03-12 10:43:01 +01:00
lokalise-bot
bcedf11c69 Lokalise: update of locales/pl.json 2019-03-12 10:43:00 +01:00
Robert Schäfer
31c056e8d3 Display who disabled a resource 2019-03-10 22:40:29 +01:00
Robert Schäfer
d114d71fac Remove unrelated translations 2019-03-10 18:24:37 +01:00
Robert Schäfer
dd6f9ddd25 Improve locales 2019-03-10 15:49:02 +01:00
Robert Schäfer
bc2471c5df Refactor ReportModal 2019-03-10 15:19:23 +01:00
Robert Schäfer
173c2c3281 Test+implement modal wrapper for DisableModal 2019-03-10 15:19:23 +01:00
Robert Schäfer
221958ba10 Merge remote-tracking branch 'victorrms2/patch-1' into update_translations 2019-03-09 22:33:17 +01:00
Robert Schäfer
6f558db8aa Upload/Download translations from lokalise.co
@appinteractive @mattwr18 @Tirokk I did the following steps:

1. Upload current translations for `en` and `de` to lokalise.co
  * this did not update or create any keys, instead
    all keys were skipped (apparently already there)
2. Download the translations on lokalise with the following settings:
  * ICU message with numeric pluralization
  * Don't escape forward slashes
  * Indent with 2 spaces
2019-03-09 22:02:43 +01:00
Victor
a3e4633329
Small changes on translation mistakes - Portuguese
The translation of "post" is "postagem", and not "pastagem". Pastagem means where the cow eats grass.
The "admin" was as "Administrator", while the correct word is "Administrador".

I'm not sure about what "Shouts" are, but I don't really know if the word "Gritos" is the properly for this thing. In portuguese, when you say "Grito", the literal translation of "Shouts" you think of a person screaming, and I don't think that's was the intention. If somebody could explain me what a "Shout" means in this code I could help in a more accurate translation.
2019-03-09 17:47:34 -03:00
Matt Rider
796b2d8488 Merge branch 'master' of github.com:Human-Connection/Nitro-Web into 37-full-text-search-top-bar 2019-03-08 17:39:20 -03:00
Robert Schäfer
e10b9fde74 Fix translations, lint and some tests 2019-03-08 20:41:17 +01:00
Matt Rider
3cebb0eea0 Update ReportModal to work with back end 2019-03-08 20:41:17 +01:00
Grzegorz Leoniec
f8c24eb79a
Merge master in 2019-03-08 18:38:33 +01:00
Robert Schäfer
ba369d82fe Fix translations, lint and some tests 2019-03-08 01:39:28 +01:00
Matt Rider
842d68c129 Update ReportModal to work with back end 2019-03-07 20:59:13 -03:00
Grzegorz Leoniec
d30649164a
Improved following and shout behavior 2019-03-05 17:19:35 +01:00
Grzegorz Leoniec
66edec0dc8
Translated shot button 2019-03-05 14:30:02 +01:00
Grzegorz Leoniec
e20d3fb214
Improved following button and translated it 2019-03-05 13:43:09 +01:00
Robert Schäfer
1672db0dfb Implement custom error page
We need styling and additional translation for other
HTTP error codes.

CC @appinteractive
2019-03-04 15:39:09 +01:00
Grzegorz Leoniec
5b33257f5a
Merged master in 2019-02-28 10:31:40 +01:00
Grzegorz Leoniec
34a863424b
Show search results while typing 2019-02-19 10:37:31 +01:00
Wolfgang Huß
780ff65254 Add 'times-circle' as right icon to search etc. 2019-02-16 12:40:47 +01:00
Robert Schäfer
ba5159b70c Add translations to fix first step definitions 2019-02-15 16:00:40 +01:00
Wolfgang Huß
01b8f0dcba Add comments to the code and overtake some additional code from the Alpha 2019-02-12 12:01:57 +01:00
Matt Rider
b032887430 Write firs component test, add search placeholder translation 2019-02-05 09:59:27 -02:00
Grzegorz Leoniec
a134d33b28
Improved content menu 2019-01-28 12:18:06 +01:00
Grzegorz Leoniec
83cc6e5377
Added more content menu translations 2019-01-23 21:36:29 +01:00
Grzegorz Leoniec
dfb488271e
Translated empty message 2019-01-17 19:23:29 +01:00
Grzegorz Leoniec
9982102f55
merged master in 2019-01-16 19:02:28 +01:00
Grzegorz Leoniec
6f02534d4f
Merge branch 'master' into locations 2019-01-15 11:42:39 +01:00
Grzegorz Leoniec
d44fbcc594
Improved content menu 2019-01-15 10:54:57 +01:00
Grzegorz Leoniec
3bf42da9ea
More translations 2019-01-15 09:39:48 +01:00
Grzegorz Leoniec
bfd0feae49
Merge branch 'master' into report-content 2019-01-14 17:17:48 +01:00
Grzegorz Leoniec
d6f5232d45
User Português for Portuguese 2019-01-12 17:06:43 +01:00
Grzegorz Leoniec
1c2745ed2d
Translated report dialog and improved popover 2019-01-12 14:09:17 +01:00
Grzegorz Leoniec
7dde1a1844
Added basic moderation interface 2019-01-11 19:20:00 +01:00
Grzegorz Leoniec
00e61e5978
Added translations for modal. 2019-01-11 15:24:31 +01:00
Grzegorz Leoniec
b2ab7e4301
merged master in 2019-01-11 15:19:02 +01:00
Grzegorz Leoniec
5ee25ead00
Merge branch 'master' into locations 2019-01-08 22:56:09 +01:00
Grzegorz Leoniec
3afc0e5a32
More translations applied 2019-01-07 18:52:26 +01:00