From 3f34e5dadfce3924554315ab9d60ec244fff0de5 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 8 Jul 2020 17:52:41 -0400 Subject: [PATCH 1/4] Adding some languages for weblate. --- ui/src/i18next.ts | 6 ++++++ ui/src/utils.ts | 12 ++++++++++++ ui/translations/ga.json | 1 + ui/translations/km.json | 1 + ui/translations/sr_Latn.json | 1 + 5 files changed, 21 insertions(+) create mode 100644 ui/translations/ga.json create mode 100644 ui/translations/km.json create mode 100644 ui/translations/sr_Latn.json diff --git a/ui/src/i18next.ts b/ui/src/i18next.ts index 7a341ceab..3657da33b 100644 --- a/ui/src/i18next.ts +++ b/ui/src/i18next.ts @@ -25,6 +25,9 @@ import { tr } from './translations/tr'; import { hu } from './translations/hu'; import { uk } from './translations/uk'; import { sq } from './translations/sq'; +import { km } from './translations/km'; +import { ga } from './translations/ga'; +import { sr_Latn } from './translations/sr_Latn'; // https://github.com/nimbusec-oss/inferno-i18next/blob/master/tests/T.test.js#L66 const resources = { @@ -53,6 +56,9 @@ const resources = { hu, uk, sq, + km, + ga, + sr_Latn, }; function format(value: any, format: any, lng: any): any { diff --git a/ui/src/utils.ts b/ui/src/utils.ts index f65ca4e37..3b0777944 100644 --- a/ui/src/utils.ts +++ b/ui/src/utils.ts @@ -22,6 +22,9 @@ import 'moment/locale/tr'; import 'moment/locale/hu'; import 'moment/locale/uk'; import 'moment/locale/sq'; +import 'moment/locale/km'; +import 'moment/locale/ga'; +import 'moment/locale/sr'; import { UserOperation, @@ -72,9 +75,11 @@ export const languages = [ { code: 'eo', name: 'Esperanto' }, { code: 'es', name: 'Español' }, { code: 'de', name: 'Deutsch' }, + { code: 'ga', name: 'Gaeilge' }, { code: 'gl', name: 'Galego' }, { code: 'hu', name: 'Magyar Nyelv' }, { code: 'ka', name: 'ქართული ენა' }, + { code: 'km', name: 'ភាសាខ្មែរ' }, { code: 'hi', name: 'मानक हिन्दी' }, { code: 'fa', name: 'فارسی' }, { code: 'ja', name: '日本語' }, @@ -85,6 +90,7 @@ export const languages = [ { code: 'fr', name: 'Français' }, { code: 'sv', name: 'Svenska' }, { code: 'sq', name: 'Shqip' }, + { code: 'sr_Latn', name: 'srpski' }, { code: 'tr', name: 'Türkçe' }, { code: 'uk', name: 'Українська Mова' }, { code: 'ru', name: 'Русский' }, @@ -418,6 +424,12 @@ export function getMomentLanguage(): string { lang = 'uk'; } else if (lang.startsWith('sq')) { lang = 'sq'; + } else if (lang.startsWith('km')) { + lang = 'km'; + } else if (lang.startsWith('ga')) { + lang = 'ga'; + } else if (lang.startsWith('sr')) { + lang = 'sr'; } else { lang = 'en'; } diff --git a/ui/translations/ga.json b/ui/translations/ga.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/ui/translations/ga.json @@ -0,0 +1 @@ +{} diff --git a/ui/translations/km.json b/ui/translations/km.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/ui/translations/km.json @@ -0,0 +1 @@ +{} diff --git a/ui/translations/sr_Latn.json b/ui/translations/sr_Latn.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/ui/translations/sr_Latn.json @@ -0,0 +1 @@ +{} From 75251f6e7868a12420be06d08168dbdf1ed4bc88 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 9 Jul 2020 09:47:26 -0400 Subject: [PATCH 2/4] Adding select quoting of text for comments. Fixes #790 --- ui/src/components/comment-form.tsx | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/ui/src/components/comment-form.tsx b/ui/src/components/comment-form.tsx index 770c127c7..32bc37860 100644 --- a/ui/src/components/comment-form.tsx +++ b/ui/src/components/comment-form.tsx @@ -98,7 +98,7 @@ export class CommentForm extends Component { } componentDidMount() { - var textarea: any = document.getElementById(this.id); + let textarea: any = document.getElementById(this.id); autosize(textarea); this.tribute.attach(textarea); textarea.addEventListener('tribute-replaced', () => { @@ -106,6 +106,22 @@ export class CommentForm extends Component { this.setState(this.state); autosize.update(textarea); }); + + // Quoting of selected text + let selectedText = window.getSelection().toString(); + if (selectedText) { + let quotedText = + selectedText + .split('\n') + .map(t => `> ${t}`) + .join('\n') + '\n\n'; + this.state.commentForm.content = quotedText; + this.setState(this.state); + // Not sure why this needs a delay + setTimeout(() => autosize.update(textarea), 10); + } + + textarea.focus(); } componentDidUpdate() { From 558644b8b364697159c5832908b8497a44d6179d Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 9 Jul 2020 10:15:12 -0400 Subject: [PATCH 3/4] Adding lemmy's devs / contributors to the sidebar. Fixes #743 --- ui/assets/css/main.css | 7 +++++++ ui/src/components/main.tsx | 10 +++++++--- ui/translations/en.json | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ui/assets/css/main.css b/ui/assets/css/main.css index fd65148c7..9f744fb1c 100644 --- a/ui/assets/css/main.css +++ b/ui/assets/css/main.css @@ -264,3 +264,10 @@ pre { width: 0px !important; padding: 0 !important; } + +br.big { + display: block; + content: ""; + margin-top: 1rem; +} + diff --git a/ui/src/components/main.tsx b/ui/src/components/main.tsx index 207350496..9e9027d63 100644 --- a/ui/src/components/main.tsx +++ b/ui/src/components/main.tsx @@ -373,17 +373,21 @@ export class Main extends Component { # # -

+

#

# -

+

# -

+

# # # # +

+ + # +

diff --git a/ui/translations/en.json b/ui/translations/en.json index 62b11ce4a..98b311146 100644 --- a/ui/translations/en.json +++ b/ui/translations/en.json @@ -217,7 +217,7 @@ "no": "no", "powered_by": "Powered by", "landing_0": - "Lemmy is a <1>link aggregator / reddit alternative, intended to work in the <2>fediverse.<3>It's self-hostable, has live-updating comment threads, and is tiny (<4>~80kB). Federation into the ActivityPub network is on the roadmap. <5>This is a <6>very early beta version, and a lot of features are currently broken or missing. <7>Suggest new features or report bugs <8>here.<9>Made with <10>Rust, <11>Actix, <12>Inferno, <13>Typescript.", + "Lemmy is a <1>link aggregator / reddit alternative, intended to work in the <2>fediverse.<3>It's self-hostable, has live-updating comment threads, and is tiny (<4>~80kB). Federation into the ActivityPub network is on the roadmap. <5>This is a <6>very early beta version, and a lot of features are currently broken or missing. <7>Suggest new features or report bugs <8>here.<9>Made with <10>Rust, <11>Actix, <12>Inferno, <13>Typescript. <14> <15>Thank you to our contributors: dessalines, Nutomic, asonix, zacanger, and iav.", "not_logged_in": "Not logged in.", "logged_in": "Logged in.", "site_saved": "Site Saved.", From 20f9bde88f52ce875be4d0dc4bd5dd346dfe6b84 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 9 Jul 2020 10:44:05 -0400 Subject: [PATCH 4/4] Making comment collapse and lightning buttons not spans. Fixes #884 --- ui/src/components/comment-node.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ui/src/components/comment-node.tsx b/ui/src/components/comment-node.tsx index 839a01dcc..49b566295 100644 --- a/ui/src/components/comment-node.tsx +++ b/ui/src/components/comment-node.tsx @@ -189,8 +189,8 @@ export class CommentNode extends Component { )} -
{this.state.collapsed ? ( @@ -202,9 +202,11 @@ export class CommentNode extends Component { )} -
- + {/* This is an expanding spacer for mobile */} +
+ •