hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'settings-modal' into shigusegubu

Browse source 
* settings-modal:
  fixes. sorry for bad commit message i'm tired
  lint
  Move modal frame parts away from modal-content into modal, improve error handling
  moved multiChoiceProperties where it fits better
This commit is contained in:
Henry Jameson 2020-05-27 12:39:13 +03:00
commit db2d3d9c8c
16 changed files with 301 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/i18n/en.json
View file

@ -59,8 +59,10 @@
"apply": "Apply",
"submit": "Submit",
"more": "More",
"loading": "Loading…",
"generic_error": "An error occured",
"error_retry": "Please try again",
"retry": "Try again",
"optional": "optional",
"show_more": "Show more",
"show_less": "Show less",