Commit graph

1439 commits

Author SHA1 Message Date
Exilat
0a261d2a7d Adds Occitan locale 2018-10-25 17:19:31 +00:00
Henry
48d6483700 Merge branch 'instance-setting-fallback' into 'develop'
Fall back to instance settings consistently

See merge request pleroma/pleroma-fe!361
2018-10-21 21:01:22 +00:00
Henry
5f65520287 Merge branch 'sorted-messages' into 'develop'
Sort messages object

See merge request pleroma/pleroma-fe!362
2018-10-21 20:26:36 +00:00
fadelkon
ec7b7ab49c Sort messages object by language code so that it's easier from the UI to browse them. 2018-10-21 22:18:38 +02:00
scarlett
c02a9089e1 explicitly set collapseMessageWithSubject to undefined 2018-10-21 19:42:38 +01:00
scarlett
d6ad08050a Fall back to instance settings consistently 2018-10-21 18:04:23 +01:00
Henry
82cc37a55e Merge branch 'i18n/arabic' into 'develop'
Add arabic translation

See merge request pleroma/pleroma-fe!360
2018-10-21 12:43:30 +00:00
ButterflyOfFire
131526373f Adding arabic to messages.js 2018-10-21 15:38:56 +03:00
ButterflyOfFire
373d6ca990 Adding arabic translation. 2018-10-21 15:37:44 +03:00
Henry
d81887e34f Merge branch 'catalan' into 'develop'
Create catalan translation

See merge request pleroma/pleroma-fe!355
2018-10-17 18:36:35 +00:00
fadelkon
bf3e3f8b9a Translate not only timeago prefix, but time units. Make consistent the translation for "bio" and add ellipsis to the default status text. 2018-10-16 18:11:49 +02:00
kaniini
e64af481d2 Merge branch 'hide-statistics' into 'develop'
Add options for hiding post and user engagement statistics.

See merge request pleroma/pleroma-fe!336
2018-10-16 14:37:32 +00:00
scarlett
2bb663f0f6 satisfy lint 2018-10-16 14:15:04 +01:00
scarlett
4cc1ed6171 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into hide-statistics 2018-10-16 14:09:29 +01:00
fadelkon
0c2f4b925e Add catalan require to messages.js 2018-10-14 11:25:20 +02:00
Henry
f554edc054 Merge branch 'update-nb' into 'develop'
Update norwegian translation

See merge request pleroma/pleroma-fe!356
2018-10-14 08:41:27 +00:00
morguldir
7c4790d1bc Update norwegian translation 2018-10-14 06:22:04 +02:00
fadelkon
59dec1b43f Finish general and timeago catalan strings. Glossary:
* bio: presentació
* timeline: flux [d'entrades]
* post/status: entrada
* settings: configuració
* user: usuari/a
* users: usuàries
* background: fons de pantalla
* banner: fons de perfil
* follower: seguidor/a
* follow: contacte/a qui segueixo
* avatar: avatar
* [visibility] scope: abast de la publicació

Translation based on https://www.softcatala.org/guia-estil-de-softcatala/convencions-de-format/ and http://www.termcat.cat/ca/Cercaterm/ .
2018-10-13 18:17:00 +02:00
fadelkon
f8323b72ae Translate some strings to catalan. Most part of block "settings" is not translated yet 2018-10-02 20:33:07 +02:00
fadelkon
0beba08618 Add placeholder catalan translation file to be able to see the work in progress in further commits 2018-10-02 20:31:02 +02:00
kaniini
65c03f1a0b Merge branch 'i18n/no_rich_text' into 'develop'
Less confusing description for no_rich_text_formatting

See merge request pleroma/pleroma-fe!351
2018-09-27 21:24:23 +00:00
Henry
9d0bbe37e6 Merge branch 'fix/i18n/instance_default' into 'develop'
Fix instance_default in en and fr

See merge request pleroma/pleroma-fe!352
2018-09-25 11:38:56 +00:00
Henry Jameson
85235981d1 i think it's due to my shitty js-to-json regex 2018-09-25 14:30:05 +03:00
Henry Jameson
11f1bac502 Less confusing description 2018-09-25 14:01:01 +03:00
Henry
bfd2b45672 Merge branch 'fixup_french_translation' into 'develop'
Fixup french translation

See merge request pleroma/pleroma-fe!350
2018-09-24 15:10:47 +00:00
Haelwenn (lanodan) Monnier
8cb62fae70
src/i18n/fr.json: More accurate translation 2018-09-24 16:55:19 +02:00
Henry
40210ae31b Merge branch 'update-japanese-translation' into 'develop'
Update Japanese translation

See merge request pleroma/pleroma-fe!349
2018-09-24 10:43:18 +00:00
hakabahitoyo
86528d84e2 update Japanese translation 2018-09-23 10:27:05 +09:00
kaniini
01127c2db0 Merge branch 'update/french-translation' into 'develop'
update french translation

See merge request pleroma/pleroma-fe!348
2018-09-22 04:53:38 +00:00
William Pitcock
2f674eb13d update french translation 2018-09-22 04:46:09 +00:00
kaniini
1cbabf31ee Merge branch 'feature/rich-text-optout' into 'develop'
add support for disabling rich text formatting

See merge request pleroma/pleroma-fe!347
2018-09-22 04:44:02 +00:00
William Pitcock
1af5c8fd39 add support for disabling rich text formatting 2018-09-22 03:54:05 +00:00
Henry
cd48268c85 Merge branch 'betterStorage' into 'develop'
Better storage

See merge request pleroma/pleroma-fe!343
2018-09-21 09:19:02 +00:00
Henry Jameson
1c2f0029e4 Merge remote-tracking branch 'upstream/develop' into betterStorage
* upstream/develop:
  More languages
  added usage
  a tool to check what's missing from a language
  all other languages which do not have MRs related to them separated
  seems to be working
2018-09-21 12:14:20 +03:00
Henry
6f32ccf417 Merge branch 'translations-separation' into 'develop'
Separation of translation file into several smaller ones.

Closes #142

See merge request pleroma/pleroma-fe!337
2018-09-21 09:02:01 +00:00
Henry Jameson
a61ad0544a small thing to display instance-provided default 2018-09-20 17:21:11 +03:00
Henry Jameson
537b1ff2d8 Merge remote-tracking branch 'upstream/develop' into translations-separation
* upstream/develop:
  Update Hebrew translation
  fixed autocomplete
  Debug
2018-09-20 16:12:00 +03:00
Henry Jameson
419744080f console.log cleanup 2018-09-17 19:16:58 +03:00
Henry Jameson
03f28d3fa6 Fixed "user.id is undefined" or something error more sane by properly handling
HTTP errors
2018-09-17 18:55:11 +03:00
Henry Jameson
e53f238278 undo rename because it makes less sense now. 2018-09-17 18:54:48 +03:00
Henry Jameson
347c2c02df proxying nodeinfo 2018-09-17 18:54:34 +03:00
Henry Jameson
9467462ef0 made FE work even without either api or static config 2018-09-17 18:54:08 +03:00
Henry Jameson
40a175389a Removed warning. Added support for working without static/config.json 2018-09-17 18:00:56 +03:00
Henry Jameson
394153380d more missing stuff 2018-09-17 17:51:39 +03:00
Henry Jameson
136add8a2f fix some missing stuff 2018-09-17 17:51:39 +03:00
Henry Jameson
1245d7917f translations 2018-09-17 17:51:39 +03:00
Henry Jameson
580aae1b54 Added more stuff that's actually being added to instanceConfig, simplified the whitelist. 2018-09-17 17:51:39 +03:00
Henry Jameson
82fa5d08c4 more refactoring 2018-09-17 17:51:39 +03:00
Henry Jameson
2db991fc7f some recategorization of options... 2018-09-17 17:51:39 +03:00
Henry Jameson
f1c16327b6 Initial version 2018-09-17 17:51:39 +03:00