diff options
| author | Henry Jameson <me@hjkos.com> | 2019-03-27 22:12:51 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2019-03-27 22:12:51 +0200 |
| commit | ff18e339cf5c243a77e4035a1348c543ebcbf8d1 (patch) | |
| tree | e950d98855e917658cd8390751fec6edb8206c48 /src/i18n | |
| parent | 0a031aae20bf1dc3bc0b15af0b794798d179aafa (diff) | |
| parent | 987b5162a7530979e9fa887a24311eb1cd480fc5 (diff) | |
Merge remote-tracking branch 'upstream/develop' into mastoapi/followers
* upstream/develop:
#442 - update placeholder linebreak
#442 - clean up Bio placeholder text
undo this change since BE returns empty object for relationship, add in a separate MR
updates normalizer for proper user handling and adds support for friends tl via mastoapi
Diffstat (limited to 'src/i18n')
| -rw-r--r-- | src/i18n/en.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json index ecf9628f..c501c6a7 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -98,7 +98,7 @@ "new_captcha": "Click the image to get a new captcha", "username_placeholder": "e.g. lain", "fullname_placeholder": "e.g. Lain Iwakura", - "bio_placeholder": "e.g.\nHi, I'm Lain\nI’m an anime girl living in suburban Japan. You may know me from the Wired.", + "bio_placeholder": "e.g.\nHi, I'm Lain.\nI’m an anime girl living in suburban Japan. You may know me from the Wired.", "validations": { "username_required": "cannot be left blank", "fullname_required": "cannot be left blank", |