diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-07-17 22:07:20 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-07-17 22:07:20 +0200 |
| commit | cd87d7dcef814ad86fb15334680cb0e3232437a9 (patch) | |
| tree | 63db8838568ea440bb3cb9797cdbaf5c4952e9e7 /config/locales/simple_form.ast.yml | |
| parent | 9094c2f52c24e1c00b594e7c11cd00e4a07eb431 (diff) | |
| parent | c3f0621a59a74d0e20e6db6170894871c48e8f0f (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
- `.env.production.sample`: Our sample config file is very different from upstream since it is much more complete. Upstream added documentation for a few env variables. Copied the new variables/documentation from upstream. - `app/lib/feed_manager.rb`: Upstream added a timeline type (hashtags), while glitch-soc already had an extra one (direct messages). Not really a conflict but textually close changes. Ported upstream's changes. - `app/models/custom_emoji.rb`: Upstream upped the custom emoji size limit, while glitch-soc had configurable limits. Upped the default limits accordingly. - `streaming/index.js`: Upstream reworked how hastags were normalized. Minor conflict due to glitch-soc's handling of instance-local posts. Ported upstream's changes.
Diffstat (limited to 'config/locales/simple_form.ast.yml')
| -rw-r--r-- | config/locales/simple_form.ast.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml index c98913985..b41e6404b 100644 --- a/config/locales/simple_form.ast.yml +++ b/config/locales/simple_form.ast.yml @@ -96,6 +96,10 @@ ast: reblog: Daquién compartió dalgún estáu de to tag: name: Etiqueta + user_role: + name: Nome + permissions_as_keys: Permisos + position: Prioridá 'no': Non recommended: Aconséyase required: |