* Change locales file generation to use JSON sources
Instead of inheriting in JS files, set locale inheritance in the
theme's YML file, and inherit in the generated locale file, rather
than the source file.
* Convert glitch-soc JS translation files to JSON
Obtained running the following:
```sh
sed -i -z "s/import inherited from '.*';\s*\nconst messages = //" *.js
sed -i "s/\s*\/\/.*//" *.js
sed -i -z "s/;\s*export default .*/\n/" *.js
for i in *.js; do
json5 $i | json_pp > ${i}on;
done
```
* Change `yarn manage:translations` to exclude any translation already defined upstream
* Run yarn manage:translations
* Add missing locale keys
Added missing translation keys to en.js to make translation easier and more complete.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove translation keys for explore
Have been added to vanilla in #2014
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove unused key
Sorry, originally worked on this on my custom fork, which has this key, before I decided to work on glitch.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
Upstream change too close to a glitch-soc-specific string.
The glitch-soc-specific string should not have been in this file, so it
has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
Upstream refactored a part, that as usual is split and duplicated in various
pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
Upstream fixed custom.css path in a different way than we did, went with
upstream's change.
Claire
www-cat
Plastikmensch
Michal Dvorak
prplecake
Jeong Arm
atsu1125
Julianne420
Thibaut Girka
otrapersona
Spencer Alves
霧島ひなた
Marcin Mikołajczak
imncls
kibigo!
ncls7615
beatrix
cwm