Shel R
3b9a56d4b3
Merge branch 'master' into master
2017-04-07 22:21:21 -04:00
Chad Pytel
1a82d2bde6
Use I18n for media attachment validation errors
...
These are currently user facing errors, but are not localized. This adds the
ability for these messages to be localized.
2017-04-07 14:23:18 -04:00
Eugen
ef7240169a
Merge branch 'master' into feature-customized-default-locale
2017-04-07 13:07:03 +02:00
Jantso Porali
fb0ce9d38d
Update Finnish translations, add sample Minio config ( #954 )
2017-04-07 12:58:12 +02:00
Eugen Rochko
9bb84337a7
Allow setting of default language through config
...
Setting of locale in controller extracted to Localized concern,
the doorkeeper authorized applications controller moved under
custom namespace with inclusion of Localized, which resolves the
"it sometimes appears in a different random language" bug
2017-04-07 12:40:26 +02:00
Eugen
1781fcaea4
Force UTF8 encoding on generated XML ( #1140 )
2017-04-07 11:09:14 +02:00
André Lewin
783de713cd
Merge branch 'master' into master
2017-04-05 20:28:58 +02:00
Eugen Rochko
06e3d9bdd8
Make sure Rabl is using Oj
2017-04-05 19:29:30 +02:00
Jantso Porali
5c414eeb45
updated blocking translation
2017-04-05 14:53:35 +02:00
Jantso Porali
16d14e854b
updated two-way auth and preferences translation
2017-04-05 14:49:29 +02:00
Jantso Porali
d49612327a
updated translation for about page
2017-04-05 14:47:42 +02:00
JantsoP
c0295924bc
Merge branch 'master' into master
2017-04-05 10:07:17 +02:00
JantsoP
c33a8ce307
updated reblog to boost translation
...
Since it is that :D
2017-04-05 09:57:25 +02:00
JantsoP
7ea7713997
udpdated display_name translation
2017-04-05 09:52:31 +02:00
JantsoP
b97a8236fb
updated reblog translation
2017-04-05 09:51:35 +02:00
Eugen Rochko
d9f1e07c6c
Fix spec
2017-04-05 03:31:26 +02:00
Eugen
05de364fbc
Merge pull request #863 from Eychics/master
...
Add closed_registrations message on French language
2017-04-05 03:11:13 +02:00
Eugen
c571ed77d7
Merge pull request #818 from JantsoP/master
...
Updated Finnish Translation
2017-04-05 03:09:20 +02:00
Eugen
cc82f3adff
Merge pull request #866 from kklleemm/patch-1
...
Fix typos on french translations
2017-04-05 03:06:41 +02:00
Eugen
45c3772ddb
Merge pull request #792 from chapeaumeinfreund/master
...
Updated and fixed german orthography
2017-04-05 03:05:50 +02:00
Eugen
27b758f328
Merge pull request #790 from chapeaumeinfreund/patch-1
...
Updated and fixed german orthography
2017-04-05 03:05:31 +02:00
Eugen
4751381a24
Merge pull request #852 from peterkeen/email-whitelist-817
...
[#817 ] Add email whitelist
2017-04-05 03:04:58 +02:00
Eugen
2f7da4167f
Merge pull request #805 from nevillepark/master
...
Changed "reblogs" to "boosts"
2017-04-05 03:00:57 +02:00
Clément D
ba8744d0a7
Fix typos on french translations
2017-04-04 19:09:54 +02:00
Thibaut (Eychics)
6afd3a6eab
Add closed_registrations message on French language
2017-04-04 18:58:19 +02:00
Pete Keen
f28fcf9080
[ #817 ] Add email whitelist
...
This adds the ability to filter user signup with a whitelist
instead of or in addition to a blacklist.
Fixes #817
2017-04-04 11:20:15 -04:00
Eugen Rochko
353a30810c
New admin setting: open/close registrations, with custom message, from the admin UI
2017-04-04 15:28:12 +02:00
JantsoP
0c0e1c2519
Merge branch 'master' into master
2017-04-04 08:41:46 +02:00
JantsoP
0c0acb22e6
updated translation
2017-04-04 08:29:53 +02:00
Neville Park
7b297cc6d2
Changed "reblogs" to "boosts"
2017-04-03 17:45:36 -04:00
axolotl
d6d192c914
added Esperanto (eo)
2017-04-03 20:22:50 +02:00
Eugen Rochko
c23ef9a706
Fix norwegian translation being malformed
2017-04-03 19:50:55 +02:00
Korbinian
ce9bb73e96
Updated and fixed orthography
2017-04-03 19:10:48 +02:00
Korbinian
b8324b3aed
Updated and fixed german orthography
2017-04-03 19:01:17 +02:00
Eugen Rochko
6ebe31e716
Make default admin UI page reports. Add admin UI for creating a domain block
2017-04-03 18:55:06 +02:00
Christopher Kolstad
c1f52eaff1
Add Norwegian locale
2017-04-03 16:32:03 +02:00
JantsoP
e74a4efa20
another typo. fuck me
2017-04-03 14:56:13 +02:00
JantsoP
54db5aa06c
fixed an sneaky peaky tpy
2017-04-03 14:54:53 +02:00
JantsoP
bed61b7cc4
add finnish translation
...
add finnish translation
2017-04-03 14:43:07 +02:00
JantsoP
aa77d63da9
add finnish translation
...
add finnish translation
2017-04-03 14:20:50 +02:00
JantsoP
35ad63910d
Merge branch 'master' into master
2017-04-03 13:50:57 +02:00
JantsoP
1c84f62d6d
add finnish translation
...
add finnish translation
2017-04-03 13:35:12 +02:00
JantsoP
cbff9a2e15
finnish translation
...
finnish translation
2017-04-03 13:25:46 +02:00
JantsoP
5045c23636
updated final translation
...
updated final translation
2017-04-03 13:07:09 +02:00
JantsoP
7606beb4dd
Create new translation file
...
Still in progress. Should be done shortly
2017-04-03 12:42:09 +02:00
Angristan
38bf31d425
Improve french translation
2017-04-03 11:04:00 +02:00
Valentin Lorentz
7d5921dd5c
Improve French translation
...
Fix typos and typography. Make vocabulary and grammar more uniform.
2017-04-03 03:16:37 +02:00
Eugen
720922cd13
Merge pull request #746 from eramdam/feature/improve-french-locales
...
Feature/improve french locales (again)
2017-04-03 00:25:56 +02:00
Damien Erambert
066b904205
Fix typo in simple_form.fr.yml
2017-04-02 14:04:06 -07:00
Damien Erambert
b7554089cb
Improve translation of data import in fr.yml
2017-04-02 14:03:57 -07:00