From e41117c8785e414f543501dd4c50c96d5485d694 Mon Sep 17 00:00:00 2001 From: Ricardo de Arruda Date: Wed, 1 Jul 2020 00:30:23 +0300 Subject: Replace search button to input field at navbar. * Search input not rendered at /search path. * Navbar wrapped with withRouter for accessing history props. * Flex-grow/shrink control the width of the input element dynamically. --- ui/assets/css/main.css | 8 ++++++++ ui/src/components/navbar.tsx | 49 ++++++++++++++++++++++++++++++++++++-------- ui/src/index.tsx | 2 +- 3 files changed, 50 insertions(+), 9 deletions(-) diff --git a/ui/assets/css/main.css b/ui/assets/css/main.css index c1f004d7..4d9a099f 100644 --- a/ui/assets/css/main.css +++ b/ui/assets/css/main.css @@ -249,3 +249,11 @@ pre { white-space: pre-wrap; word-break: keep-all; } + +.search-bar { + flex-basis: 10%; + flex-shrink: 3; + flex-grow: 0.3; + max-width: 33%; + min-width: 11em; +} \ No newline at end of file diff --git a/ui/src/components/navbar.tsx b/ui/src/components/navbar.tsx index 4cb74391..175f590d 100644 --- a/ui/src/components/navbar.tsx +++ b/ui/src/components/navbar.tsx @@ -1,5 +1,5 @@ import { Component, linkEvent } from 'inferno'; -import { Link } from 'inferno-router'; +import { Link, withRouter } from 'inferno-router'; import { Subscription } from 'rxjs'; import { retryWhen, delay, take } from 'rxjs/operators'; import { WebSocketService, UserService } from '../services'; @@ -12,6 +12,7 @@ import { GetPrivateMessagesForm, PrivateMessagesResponse, SortType, + SearchType, GetSiteResponse, Comment, CommentResponse, @@ -19,6 +20,7 @@ import { UserView, PrivateMessageResponse, WebSocketJsonResponse, + SearchForm, } from '../interfaces'; import { wsJsonToRes, @@ -42,9 +44,10 @@ interface NavbarState { unreadCount: number; siteName: string; admins: Array; + searchParam: string; } -export class Navbar extends Component { +class Navbar extends Component { private wsSub: Subscription; private userSub: Subscription; emptyState: NavbarState = { @@ -56,6 +59,7 @@ export class Navbar extends Component { expanded: false, siteName: undefined, admins: [], + searchParam: '', }; constructor(props: any, context: any) { @@ -87,6 +91,25 @@ export class Navbar extends Component { } WebSocketService.Instance.getSite(); + + this.handleSearchParam = this.handleSearchParam.bind(this); + } + + handleSearchParam(i: Navbar, event: any) { + i.state.searchParam = event.target.value; + i.setState(i.state); + } + + updateUrl() { + this.props.history.push( + `/search/q/${this.state.searchParam}/type/all/sort/topall/page/1` + ); + this.setState({ searchParam: '' }); + } + + handleSearchSubmit(i: Navbar, event: any) { + event.preventDefault(); + i.updateUrl(); } render() { @@ -143,11 +166,6 @@ export class Navbar extends Component { {i18n.t('communities')} -
  • - - {i18n.t('search')} - -
  • {
    • -
      + {!this.props.history.location.pathname.match(/^\/search/) && ( +
      +
      + +
      +
      + )} +
        {this.canAdmin && (
      • { } } } + +export default withRouter(Navbar); diff --git a/ui/src/index.tsx b/ui/src/index.tsx index 8e49df9f..09d3aec6 100644 --- a/ui/src/index.tsx +++ b/ui/src/index.tsx @@ -2,7 +2,7 @@ import { render, Component } from 'inferno'; import { BrowserRouter, Route, Switch } from 'inferno-router'; import { Provider } from 'inferno-i18next'; import { Main } from './components/main'; -import { Navbar } from './components/navbar'; +import Navbar from './components/navbar'; import { Footer } from './components/footer'; import { Login } from './components/login'; import { CreatePost } from './components/create-post'; -- cgit v1.2.3 From 0350f4bbebd0e9afd952611b377941bca269fb3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20T=C3=B6tterman?= Date: Fri, 3 Jul 2020 13:08:01 +0300 Subject: Fix ansible for Ubuntu 20.04 Focal (#856) * Fix ansible for Ubuntu 20.04 Focal * Use proper version comparison * Changes based on feedback --- ansible/lemmy.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ansible/lemmy.yml b/ansible/lemmy.yml index 5c8a5f91..a73f7293 100644 --- a/ansible/lemmy.yml +++ b/ansible/lemmy.yml @@ -11,6 +11,7 @@ when: lemmy_base_dir is not defined - name: install python for Ansible + # python2-minimal instead of python-minimal for ubuntu 20.04 and up raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal python-setuptools) args: executable: /bin/bash @@ -27,7 +28,18 @@ - 'docker-compose' - 'docker.io' - 'certbot' + + - name: install certbot-nginx on ubuntu < 20 + apt: + pkg: - 'python-certbot-nginx' + when: ansible_distribution == 'Ubuntu' and ansible_distribution_version|version_compare('20.04', '<') + + - name: install certbot-nginx on ubuntu > 20 + apt: + pkg: + - 'python3-certbot-nginx' + when: ansible_distribution == 'Ubuntu' and ansible_distribution_version|version_compare('20.04', '>=') - name: request initial letsencrypt certificate command: certbot certonly --nginx --agree-tos -d '{{ domain }}' -m '{{ letsencrypt_contact_email }}' -- cgit v1.2.3 From 916592944af8e32f2044c9acf0d57eb7991427a5 Mon Sep 17 00:00:00 2001 From: Riley Date: Fri, 3 Jul 2020 12:22:39 -0500 Subject: Verify activitypub payload digests (#885) --- server/Cargo.lock | 4 ++-- server/Cargo.toml | 2 +- server/src/routes/federation.rs | 12 +++++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/server/Cargo.lock b/server/Cargo.lock index c54419e1..7b0d9a88 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -1413,9 +1413,9 @@ dependencies = [ [[package]] name = "http-signature-normalization-actix" -version = "0.4.0-alpha.0" +version = "0.4.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09afff6987c7edbed101d1cddd2185786fb0af0dd9c06b654aca73a0a763680f" +checksum = "1c6efbc3e600cdd617585f4f15be3726c6942fb2eba3c8c79474c5d3159ad7c0" dependencies = [ "actix-http", "actix-web", diff --git a/server/Cargo.toml b/server/Cargo.toml index 8daf72c4..22507994 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -43,7 +43,7 @@ percent-encoding = "2.1.0" comrak = "0.7" openssl = "0.10" http = "0.2.1" -http-signature-normalization-actix = { version = "0.4.0-alpha.0", default-features = false, features = ["sha-2"] } +http-signature-normalization-actix = { version = "0.4.0-alpha.1", default-features = false, features = ["sha-2"] } base64 = "0.12.1" tokio = "0.2.21" futures = "0.3.5" diff --git a/server/src/routes/federation.rs b/server/src/routes/federation.rs index fe6e3365..20b5dc83 100644 --- a/server/src/routes/federation.rs +++ b/server/src/routes/federation.rs @@ -12,6 +12,8 @@ use crate::{ settings::Settings, }; use actix_web::*; +use http_signature_normalization_actix::digest::middleware::VerifyDigest; +use sha2::{Digest, Sha256}; pub fn config(cfg: &mut web::ServiceConfig) { if Settings::get().federation.enabled { @@ -38,8 +40,12 @@ pub fn config(cfg: &mut web::ServiceConfig) { .route("/comment/{comment_id}", web::get().to(get_apub_comment)), ) // Inboxes dont work with the header guard for some reason. - .route("/c/{community_name}/inbox", web::post().to(community_inbox)) - .route("/u/{user_name}/inbox", web::post().to(user_inbox)) - .route("/inbox", web::post().to(shared_inbox)); + .service( + web::scope("/") + .wrap(VerifyDigest::new(Sha256::new())) + .route("/c/{community_name}/inbox", web::post().to(community_inbox)) + .route("/u/{user_name}/inbox", web::post().to(user_inbox)) + .route("/inbox", web::post().to(shared_inbox)), + ); } } -- cgit v1.2.3 From 8aa9cc11eb22f29ae5205afa638d36bf4d6f7a9c Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 3 Jul 2020 14:17:21 -0400 Subject: Fixing federation testing docs. Fixes #878 (#879) * Fixing federation testing docs. Fixes #878 * Removing extra clone. --- docs/src/contributing_federation_development.md | 44 +++++++++++++++---------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/docs/src/contributing_federation_development.md b/docs/src/contributing_federation_development.md index 520a6127..143ae9f8 100644 --- a/docs/src/contributing_federation_development.md +++ b/docs/src/contributing_federation_development.md @@ -5,14 +5,7 @@ If you don't have a local clone of the Lemmy repo yet, just run the following command: ```bash -git clone https://github.com/LemmyNet/lemmy -b federation -``` - -If you already have the Lemmy repo cloned, you need to add a new remote: -```bash -git remote add federation https://github.com/LemmyNet/lemmy -git checkout federation -git pull federation federation +git clone https://github.com/LemmyNet/lemmy ``` ## Running locally @@ -26,18 +19,34 @@ You need to have the following packages installed, the Docker service needs to b Then run the following ```bash -cd dev/federation-test -./run-federation-test.bash +cd docker/federation +./run-federation-test.bash -yarn ``` -After the build is finished and the docker-compose setup is running, open [127.0.0.1:8540](http://127.0.0.1:8540) and -[127.0.0.1:8550](http://127.0.0.1:8550) in your browser to use the test instances. You can login as admin with -username `lemmy_alpha` and `lemmy_beta` respectively, with password `lemmy`. +The federation test sets up 3 instances: + +Instance / Username | Location +--- | --- +lemmy_alpha | [127.0.0.1:8540](http://127.0.0.1:8540) +lemmy_beta | [127.0.0.1:8550](http://127.0.0.1:8550) +lemmy_gamma | [127.0.0.1:8560](http://127.0.0.1:8560) + +You can log into each using the instance name, and `lemmy` as the password, IE (`lemmy_alpha`, `lemmy`). + +Firefox containers are a good way to test them interacting. + +## Integration tests + +To run a suite of suite of federation integration tests: + +```bash +cd docker/federation-test +./run-tests.sh +``` ## Running on a server -Note that federation is currently in alpha. Only use it for testing, not on any production server, and be aware -that you might have to wipe the instance data at one point or another. +Note that federation is currently in alpha. **Only use it for testing**, not on any production server, and be aware that turning on federation may break your instance. Follow the normal installation instructions, either with [Ansible](administration_install_ansible.md) or [manually](administration_install_docker.md). Then replace the line `image: dessalines/lemmy:v0.x.x` in @@ -47,11 +56,12 @@ Follow the normal installation instructions, either with [Ansible](administratio ``` federation: { enabled: true - allowed_instances: example.com + tls_enabled: true, + allowed_instances: example.com, } ``` -Afterwards, and whenver you want to update to the latest version, run these commands on the server: +Afterwards, and whenever you want to update to the latest version, run these commands on the server: ``` cd /lemmy/ -- cgit v1.2.3 From 284f00249a8365fb8e5877aef41adae634cfb428 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 3 Jul 2020 14:19:24 -0400 Subject: Going back from jolt to dogbin iframely. jolt one had problems. (#900) --- ansible/templates/docker-compose.yml | 2 +- docker/dev/docker-compose.yml | 2 +- docker/federation/docker-compose.yml | 2 +- docker/prod/docker-compose.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/templates/docker-compose.yml b/ansible/templates/docker-compose.yml index 76c53463..f4c94fd7 100644 --- a/ansible/templates/docker-compose.yml +++ b/ansible/templates/docker-compose.yml @@ -35,7 +35,7 @@ services: restart: always iframely: - image: jolt/iframely:v1.4.3 + image: dogbin/iframely:latest ports: - "127.0.0.1:8061:80" volumes: diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index fc6e2105..51a3ecda 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -40,7 +40,7 @@ services: restart: always iframely: - image: jolt/iframely:v1.4.3 + image: dogbin/iframely:latest ports: - "127.0.0.1:8061:80" volumes: diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index 51a37b91..cbc648e6 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -107,6 +107,6 @@ services: - ./volumes/postgres_gamma:/var/lib/postgresql/data iframely: - image: jolt/iframely:v1.4.3 + image: dogbin/iframely:latest volumes: - ../iframely.config.local.js:/iframely/config.local.js:ro diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 5ccb1ec5..bc05a2b4 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -35,7 +35,7 @@ services: restart: always iframely: - image: jolt/iframely:v1.4.3 + image: dogbin/iframely:latest ports: - "127.0.0.1:8061:80" volumes: -- cgit v1.2.3 From e0b278984059d2927ff195cccd63f5a2afca3d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=ABr=C3=AB=20R=C3=ABr=C3=AB?= Date: Fri, 3 Jul 2020 18:21:25 +0000 Subject: Translated using Weblate (Albanian) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sq/ Translated using Weblate (Albanian) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sq/ Translated using Weblate (Albanian) Currently translated at 55.8% (139 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sq/ --- ui/translations/sq.json | 184 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 168 insertions(+), 16 deletions(-) diff --git a/ui/translations/sq.json b/ui/translations/sq.json index 0526fa26..5e296460 100644 --- a/ui/translations/sq.json +++ b/ui/translations/sq.json @@ -1,8 +1,8 @@ { "remove_post": "Hiqe Postimin", "no_posts": "Nuk ka Postime.", - "create_a_post": "Krijo një postim", - "create_post": "Krijo Postimin", + "create_a_post": "Krijo Postim", + "create_post": "Krijo Postim", "posts": "Postime", "related_posts": "Këto postime mund të jenë të lidhura", "cross_posts": "Ky link është postuar edhe te:", @@ -12,16 +12,16 @@ "remove_comment": "Fshije Komentin", "communities": "Komunitetet", "users": "Përdoruesit", - "create_a_community": "Krijo një komunitet", + "create_a_community": "Krijo Komunitet", "select_a_community": "Përzgjedh një komunitet", - "create_community": "Krijo komunitetin", + "create_community": "Krijo Komunitet", "remove_community": "Fshije Komunitetin", - "subscribed_to_communities": "I abonuar në", - "trending_communities": "Trendi", + "subscribed_to_communities": "Jeni abonuar në", + "trending_communities": "Komunitetet në trend <1>communities", "list_of_communities": "Lista e komuniteteve", "community_reqs": "gërma të vogla, nënvizim, dhe pa hapësira.", "invalid_community_name": "Emër invalid.", - "create_private_message": "Krijo Mesazh Privat", + "create_private_message": "Shkruaji Mesazh Privat", "send_secure_message": "Dërgo Mesazh të Sigurtë", "send_message": "Dërgo Mesazh", "message": "Mesazh", @@ -63,15 +63,15 @@ "delete_account": "Fshije Account-in", "click_to_delete_picture": "Shtyp për të fshirë imazhin.", "picture_deleted": "Imazhi është fshirë.", - "restore": "rikthe", - "ban": "", - "ban_from_site": "", + "restore": "riktheje", + "ban": "dëboje", + "ban_from_site": "dëboje nga faqja", "save": "ruaj", - "unsave": "anulo ruajtjen", + "unsave": "hiqe", "create": "krijo", "creator": "krijuesi", - "username": "Emri virtual", - "email_or_username": "Email-i ose Emri virtual", + "username": "Emri Virtual", + "email_or_username": "Email-i ose Emri Virtual", "number_of_users": "{{count}} Përdorues", "number_of_users_plural": "{{count}} Përdoruesa", "number_of_subscribers": "{{count}} i abonuar", @@ -89,7 +89,7 @@ "subscribe": "Abonohu", "subscribed": "Jeni abonuar", "next": "Tjetra", - "post": "postim", + "post": "publiko", "number_of_posts": "{{count}} Postim", "number_of_posts_plural": "{{count}} Postime", "number_of_comments": "{{count}} Koment", @@ -103,6 +103,158 @@ "remove_as_admin": "largoje si administrator", "deleted": "është fshirë nga krijuesi", "delete_account_confirm": "Paralajmërim: kjo do të fshij të gjitha të dhënat e juaja përgjithmonë. Shtyp fjalëkalimin tënd për ta konfirmuar.", - "unsubscribe": "Çabonohu", - "prev": "E mëparshme" + "unsubscribe": "Ndalo Abonimin", + "prev": "E mëparshmja", + "to": "në", + "by": "nga", + "joined": "U anëtarësuat", + "code": "Kod", + "monero": "Monero", + "bitcoin": "Bitcoin", + "crypto": "Crypto", + "general_sponsors": "Sponsorët General janë ata që dhuruan $10 deri $39 për Lemmy.", + "donate": "Dhuroni", + "donate_to_lemmy": "Dhuroji Lemmy-it", + "support_on_open_collective": "Na përkrahni në OpenCollective", + "support_on_liberapay": "Na përkrahni në Liberapay", + "support_on_patreon": "Na përkrahni në Patreon", + "sponsors_of_lemmy": "Sponsorët e Lemmy-it", + "sponsors": "Sponsorët", + "show_nsfw": "Shfaq përmbajtjen NSFW", + "modified": "e modifikuar", + "your_site": "faqja jote", + "couldnt_update_community": "Komuniteti nuk mundi të përditësohej.", + "couldnt_find_community": "Komuniteti nuk mund të gjendej.", + "no_post_edit_allowed": "Nuk lejohet redaktimi i postimit.", + "no_comment_edit_allowed": "Nuk të lejohet redaktimi i komentit.", + "couldnt_get_comments": "Nuk mund të merrnim komentet.", + "couldnt_update_comment": "Përditësimi i komentit nuk ishte i mundshëm.", + "couldnt_like_comment": "Pëlqimi i komentit nuk ishte i mundshëm.", + "couldnt_create_comment": "Krijimi i komentit nuk ishte i mundshëm.", + "site_saved": "Faqja është ruajtur.", + "logged_in": "Jeni kyçur.", + "not_logged_in": "Nuk jeni kyçur.", + "powered_by": "Fuqizuar nga", + "no": "jo", + "yes": "po", + "are_you_sure": "a je i sigurt?", + "transfer_site": "faqe transferimi", + "transfer_community": "komunitet transferimi", + "block_leaving": "A je i sigurt se do të dalësh?", + "emoji_picker": "Zgjedh Emoji", + "action": "Veprim", + "time": "Koha", + "couldnt_update_private_message": "Nuk mundëm të përditësonim mesazhin privat.", + "no_private_message_edit_allowed": "Nuk lejohet redaktimi i mesazhit privat.", + "couldnt_create_private_message": "Nuk mund të krijohej mesazhi privat.", + "system_err_login": "Gabim sistemi. Provo të shkyçesh dhe të kyçesh përsëri.", + "couldnt_update_user": "Përditësimi i përdoruesit nuk ishte i mundshëm.", + "invalid_username": "Emri virtual është invalid.", + "passwords_dont_match": "Fjalëkalimet nuk janë të njëjta.", + "password_incorrect": "Fjalëkalimi është i pasaktë.", + "couldnt_find_that_username_or_email": "Nuk mund të gjendej ky emër virtual ose email.", + "couldnt_update_site": "Faqja nuk mund të përditësohej.", + "not_an_admin": "Nuk je administrator.", + "no_slurs": "Nuk lejohen sharjet.", + "couldnt_save_post": "Postimi nuk u ruajt.", + "couldnt_update_post": "Postimi nuk mundi të përditësohej", + "couldnt_get_posts": "Nuk mund të merreshin postimet", + "couldnt_find_post": "Nuk mund të gjendeshin postimet.", + "couldnt_like_post": "Nuk mund të pëlqehej postimi.", + "post_title_too_long": "Titulli i postimit ishte shumë i gjatë.", + "couldnt_create_post": "Nuk mund të krijohej postimi.", + "no_community_edit_allowed": "Nuk të lejohet redaktimi i komunitetit.", + "couldnt_save_comment": "Ruajtja e komentit nuk ishte e mundshme.", + "landing": "Lemmy është një <1>grumbullues linqesh / alternativë e reddit-it, e hartuar që të punoj në <2>fediverse-in.<3>Është self-hostable, ka komente që përditësohen në kohë reale, dhe është shumë i vogël (<4>~80kB). Federimi në ActivityPub është i planifikuar në të ardhmen e afërt. <5>Ky është <6>një version shumë i hershëm beta, dhe shumë funksione janë të prishura ose mungojnë. <7>Jep sugjerime të reja ose raporto probleme <8>këtu.<9>Krijuar me <10>Rust, <11>Actix, <12>Inferno, <13>Typescript.", + "from": "nga", + "ethereum": "Ethereum", + "silver_sponsors": "Sponsorët e Argjendtë janë ata që dhuruan $40 për Lemmy.", + "sponsor_message": "Lemmy është softuer <1>open-source, falas, pa reklama, pagesë, apo kapital të sipërmarrjes, përgjithmonë. Donacionet tuaja mbështesin zhvillimin konstant të projektit. Falënderojmë njerëzit në vijim:", + "unban": "anuloje dëbimin", + "unban_from_site": "anuloje dëbimin nga faqja", + "banned_users": "Pëdoruesit e dëbuar", + "banned": "të dëbuar", + "sidebar": "Informatat anësore", + "sort_type": "Radhit sipas", + "new": "Të rejat", + "old": "Të vjetrat", + "week": "Javës", + "month": "Muajit", + "year": "Vitit", + "api": "API", + "inbox": "Kutia e njoftimeve", + "inbox_for": "Kutia e njoftimeve për <1>{{user}}", + "type": "Lloji", + "unread": "Të palexuara", + "message_sent": "Mesazhi u dërgua", + "search": "Kërko", + "view": "Shiko", + "logout": "Shkyçu", + "top": "Më të pëqlyerat", + "login_sign_up": "Kyçu / Regjistrohu", + "login": "Kyçu", + "sign_up": "Regjistrohu", + "hot": "Popullore", + "top_day": "Më të pëlqyerat e ditës", + "docs": "Dokumentimi", + "replies": "Përgjigjet", + "mentions": "Përmendur", + "reply_sent": "Përgjigja u dërgua", + "messages": "Mesazhet", + "password": "Fjalëkalimi", + "old_password": "Fjalëkalimi i vjetër", + "forgot_password": "harrova fjalëkalimin", + "password_change": "Ndrysho Fjalëkalimin", + "new_password": "Fjalëkalimi i ri", + "no_email_setup": "Ky server nuk e ka konfiguruar Email-in saktësisht.", + "email": "Email", + "matrix_user_id": "Përdorues i Matrix-it", + "send_notifications_to_email": "Dërgo njoftimet në Email", + "expires": "Skadon", + "language": "Gjuha", + "enable_downvotes": "Lejo votat negative", + "number_of_upvotes": "{{count}} Votë pozitive", + "number_of_upvotes_plural": "{{count}} Vota pozitive", + "number_of_downvotes": "{{count}} Votë negative", + "number_of_downvotes_plural": "{{count}} Vota negative", + "open_registration": "Hape regjistrimin", + "enable_nsfw": "Lejo përmbajtje NSFW", + "url": "URL", + "body": "Teksti", + "community": "Komuniteti", + "expand_here": "Zgjero këtu", + "subscribe_to_communities": "Abonohu në disa <1>communities.", + "verify_password": "Konfirmo Fjalëkalimin", + "optional": "E padetyrueshme", + "browser_default": "Parazgjedhur nga shfletuesi", + "downvotes_disabled": "Votat negative janë të çaktivizuara", + "upvote": "Votë pozitive", + "downvote": "Votë negative", + "registration_closed": "Regjistrimi u mbyll", + "chat": "Chat", + "recent_comments": "Komentet më të reja", + "no_results": "S'ka rezultate.", + "setup": "Konfigurimi", + "setup_admin": "Krijo një administrator të faqes", + "nsfw": "NSFW", + "theme": "Pamja", + "lemmy_instance_setup": "Konfigurimi i një instance të Lemmy-it", + "community_ban": "Jeni dëbuar nga ky komunitet.", + "site_ban": "Jeni dëbuar nga kjo faqe", + "community_already_exists": "Komuniteti ekziston më.", + "community_moderator_already_exists": "Moderatori i komunitetit ekziston më.", + "community_follower_already_exists": "Ndjekësi i komunitetit ekziston më.", + "community_user_already_banned": "Anëtari i komunitetit është dëbuar më.", + "site_already_exists": "Faqja ekziston më.", + "user_already_exists": "Përdoruesi tashmë ekziston.", + "email_already_exists": "Email-i tashmë ekziston.", + "admin_already_created": "Kërkojmë ndjesë, por tashmë është një administrator.", + "all": "Të gjitha", + "mark_all_as_read": "shëno të gjitha si të lexuara", + "overview": "Shiko në përgjithësi", + "notifications_error": "Njoftimet në desktop nuk janë të mundshme në shfletuesin tuaj. Provoni Firefox ose Chrome.", + "unread_messages": "Mesazhet e palexuara", + "reset_password_mail_sent": "Një Email është dërguar për të ndryshuar fjalëkalimin tuaj.", + "private_message_disclaimer": "Paralajmërim: Mesazhet private në Lemmy nuk janë të siguruara. Ju lutem krijoni një account në <1>Riot.im për të dërguar mesazhe të sigurta.", + "copy_suggested_title": "kopjo titullin e sugjeruar: {{title}}" } -- cgit v1.2.3 From f074e23c8077d268c65d27a95281c192c524a085 Mon Sep 17 00:00:00 2001 From: Cee Date: Fri, 3 Jul 2020 18:21:25 +0000 Subject: Translated using Weblate (Chinese (Simplified)) Currently translated at 98.7% (246 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/zh_Hans/ Translated using Weblate (Chinese (Simplified)) Currently translated at 98.7% (246 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/zh_Hans/ --- ui/translations/zh.json | 66 ++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/ui/translations/zh.json b/ui/translations/zh.json index def3b05c..ddf40222 100644 --- a/ui/translations/zh.json +++ b/ui/translations/zh.json @@ -24,29 +24,29 @@ "unlock": "解锁", "lock": "加锁", "link": "链接", - "mod": "监管人", - "mods": "监管人", + "mod": "社群管理", + "mods": "社群管理", "moderates": "监管", - "remove_as_mod": "添加监管人", - "appoint_as_mod": "移除监管人", - "modlog": "监管记录", - "admin": "管理权限", - "admins": "管理权限", - "remove_as_admin": "移除管理权限", - "appoint_as_admin": "添加管理权限", + "remove_as_mod": "删除社群管理", + "appoint_as_mod": "任命为社群管理", + "modlog": "审核记录", + "admin": "总管理员", + "admins": "总管理员", + "remove_as_admin": "移除管理员权限", + "appoint_as_admin": "添加管理员权限", "remove": "移除", - "removed": "已被管理员移除", - "locked": "已加锁", + "removed": "已被社群管理移除", + "locked": "已锁定", "reason": "原因", - "mark_as_read": "标记未读", - "mark_as_unread": "标记已读", + "mark_as_read": "标记为已读", + "mark_as_unread": "标记为未读", "delete": "删除", "deleted": "作者已删除", "restore": "恢复", "ban": "禁止", "ban_from_site": "禁止此站点", - "unban": "取消", - "unban_from_site": "取消禁止", + "unban": "取消禁止", + "unban_from_site": "取消禁止网站", "save": "保存", "unsave": "取消保存", "create": "创建", @@ -54,7 +54,7 @@ "email_or_username": "邮箱或用户名", "number_of_users": "{{count}} 名用户", "number_of_subscribers": "{{count}} 名订阅者", - "number_of_points": "{{count}} 点数", + "number_of_points": "{{count}} 积分", "name": "名字", "title": "标题", "category": "分类", @@ -70,13 +70,13 @@ "sort_type": "排序方式", "hot": "最热", "new": "最新", - "top_day": "今日", + "top_day": "每日推荐", "week": "周", "month": "月", "year": "年", "all": "所有", - "top": "最热", - "api": "应用程式介面", + "top": "推荐", + "api": "API", "inbox": "收件箱", "inbox_for": "<1>{{user}} 收件箱", "mark_all_as_read": "标记所有已读", @@ -97,7 +97,7 @@ "email": "邮箱", "optional": "选项", "expires": "过期", - "url": "网址", + "url": "相关网址", "body": "内容", "copy_suggested_title": "复制建议的标题: {{title}}", "community": "社群", @@ -160,7 +160,7 @@ "show_nsfw": "显示工作场所不宜内容", "theme": "主题", "from": "由", - "donate_to_lemmy": "向Lemmy捐赠", + "donate_to_lemmy": "向 Lemmy 捐赠", "donate": "捐赠", "monero": "门罗币", "to": "发布到", @@ -185,21 +185,21 @@ "unsticky": "取消固定", "archive_link": "链接归档", "settings": "设定", - "stickied": "已固定", + "stickied": "已置顶", "delete_account": "删除账号", - "delete_account_confirm": "警告：此操作将永久删除你的数据。输入密码进行确认。", + "delete_account_confirm": "警告！此操作将永久删除你的数据，请输入密码进行确认。", "cross_posts": "此链接也已被发布到：", "cross_post": "复数发布", "cross_posted_to": "已被复数发布到： ", "users": "用户", "banned": "已被禁止", - "creator": "发布者", + "creator": "作者", "number_of_communities": "{{count}} 个社群", - "old": "最旧", + "old": "最早", "docs": "文档", "upload_avatar": "上传头像", "replies": "回复", - "number_online": "{{count}}名在线用户", + "number_online": "{{count}} 名在线用户", "mentions": "提到", "message_sent": "已发送信息", "old_password": "当前密码", @@ -214,12 +214,12 @@ "send_notifications_to_email": "向邮箱发送通知", "language": "语言", "browser_default": "浏览器默认语言", - "downvotes_disabled": "点踩功能已禁用", - "enable_downvotes": "启用点踩功能", + "downvotes_disabled": "反对投票已禁用", + "enable_downvotes": "启用反对投票功能", "upvote": "点赞", "number_of_upvotes": "{{count}} 个赞", - "downvote": "点踩", - "number_of_downvotes": "{{count}} 个踩", + "downvote": "反对", + "number_of_downvotes": "{{count}} 个反对", "open_registration": "开放注册", "registration_closed": "注册功能已关闭", "recent_comments": "最新评论", @@ -241,5 +241,9 @@ "banned_users": "被禁止用户", "site_saved": "网站已保存", "emoji_picker": "选择表情", - "invalid_username": "用户名无效" + "invalid_username": "用户名无效", + "invalid_community_name": "无效的名称", + "click_to_delete_picture": "点击删除图片", + "picture_deleted": "图片已删除", + "select_a_community": "选择一个社群" } -- cgit v1.2.3 From 1f1ea68f459f1c8c2fc7d264cc299e5993e55ebf Mon Sep 17 00:00:00 2001 From: ButterflyOfFire Date: Fri, 3 Jul 2020 18:21:26 +0000 Subject: Translated using Weblate (Arabic) Currently translated at 75.1% (187 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/ar/ --- ui/translations/ar.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/translations/ar.json b/ui/translations/ar.json index f963439e..99140cdf 100644 --- a/ui/translations/ar.json +++ b/ui/translations/ar.json @@ -44,12 +44,12 @@ "remove_as_admin": "إزالة كمدير", "appoint_as_admin": "تعيين كمدير", "remove": "إزالة", - "removed": "تمت إزالته", + "removed": "أزاله المشرف", "reason": "السبب", "mark_as_read": "تعيين كمقروء", "mark_as_unread": "تعيين كغير مقروء بعد", "delete": "حذف", - "deleted": "تم حذفه", + "deleted": "حذفه صاحبه", "restore": "استعادة", "ban": "طرد", "ban_from_site": "طرده مِن الموقع", @@ -219,5 +219,6 @@ "banned_users": "المستخدمون المحظورون", "reset_password_mail_sent": "لقد أرسِلت إليك رسالة إلكترونية لتصفير كلمتك السرية.", "upvote": "صوّت إيجابيا", - "downvote": "صوّت سلبيا" + "downvote": "صوّت سلبيا", + "select_a_community": "اختر مجتمعًا" } -- cgit v1.2.3 From 2f54532be0da984c0444280ae23e1b3d8bcaf2a2 Mon Sep 17 00:00:00 2001 From: Ricardo de Arruda Date: Fri, 3 Jul 2020 23:20:44 +0300 Subject: Modify search button to be expandable. * Accordingly issue#814. * Input contract if un-focus input element * Search text data persisted when contracted/expanded --- ui/assets/css/main.css | 21 ++++++++----- ui/src/components/navbar.tsx | 71 +++++++++++++++++++++++++++++++++++--------- ui/src/index.tsx | 2 +- 3 files changed, 72 insertions(+), 22 deletions(-) diff --git a/ui/assets/css/main.css b/ui/assets/css/main.css index 4d9a099f..a05f5a8b 100644 --- a/ui/assets/css/main.css +++ b/ui/assets/css/main.css @@ -250,10 +250,17 @@ pre { word-break: keep-all; } -.search-bar { - flex-basis: 10%; - flex-shrink: 3; - flex-grow: 0.3; - max-width: 33%; - min-width: 11em; -} \ No newline at end of file +.form-control.search-input { + float: right !important; + transition: width 0.5s ease-out 0s !important; +} + +.show-input { + width: 13em !important; + +} +.hide-input { + background: transparent !important; + width: 0px !important; + padding: 0 !important; + } \ No newline at end of file diff --git a/ui/src/components/navbar.tsx b/ui/src/components/navbar.tsx index 175f590d..7c72d6cd 100644 --- a/ui/src/components/navbar.tsx +++ b/ui/src/components/navbar.tsx @@ -1,5 +1,5 @@ -import { Component, linkEvent } from 'inferno'; -import { Link, withRouter } from 'inferno-router'; +import { Component, linkEvent, createRef, RefObject } from 'inferno'; +import { Link } from 'inferno-router'; import { Subscription } from 'rxjs'; import { retryWhen, delay, take } from 'rxjs/operators'; import { WebSocketService, UserService } from '../services'; @@ -45,11 +45,13 @@ interface NavbarState { siteName: string; admins: Array; searchParam: string; + toggleSearch: boolean; } -class Navbar extends Component { +export class Navbar extends Component { private wsSub: Subscription; private userSub: Subscription; + private searchTextField: RefObject; emptyState: NavbarState = { isLoggedIn: UserService.Instance.user !== undefined, unreadCount: 0, @@ -60,6 +62,7 @@ class Navbar extends Component { siteName: undefined, admins: [], searchParam: '', + toggleSearch: false, }; constructor(props: any, context: any) { @@ -92,7 +95,7 @@ class Navbar extends Component { WebSocketService.Instance.getSite(); - this.handleSearchParam = this.handleSearchParam.bind(this); + this.searchTextField = createRef(); } handleSearchParam(i: Navbar, event: any) { @@ -101,10 +104,16 @@ class Navbar extends Component { } updateUrl() { - this.props.history.push( - `/search/q/${this.state.searchParam}/type/all/sort/topall/page/1` - ); + const searchParam = this.state.searchParam; this.setState({ searchParam: '' }); + this.setState({ toggleSearch: false }); + if (searchParam === '') { + this.context.router.history.push(`/search/`); + } else { + this.context.router.history.push( + `/search/q/${searchParam}/type/all/sort/topall/page/1` + ); + } } handleSearchSubmit(i: Navbar, event: any) { @@ -112,6 +121,24 @@ class Navbar extends Component { i.updateUrl(); } + handleSearchBtn(i: Navbar, event: any) { + event.preventDefault(); + i.setState({ toggleSearch: true }); + + i.searchTextField.current.focus(); + const offsetWidth = i.searchTextField.current.offsetWidth; + if (i.state.searchParam && offsetWidth > 100) { + i.updateUrl(); + } + } + + handleSearchBlur(i: Navbar, event: any) { + if (!(event.relatedTarget && event.relatedTarget.name !== 'search-btn')) { + i.state.toggleSearch = false; + i.setState(i.state); + } + } + render() { return this.navbar(); } @@ -199,16 +226,34 @@ class Navbar extends Component {
      - {!this.props.history.location.pathname.match(/^\/search/) && ( -
      -
      + {!this.context.router.history.location.pathname.match( + /^\/search/ + ) && ( +
      + +
      + +
      )} @@ -457,5 +502,3 @@ class Navbar extends Component { } } } - -export default withRouter(Navbar); diff --git a/ui/src/index.tsx b/ui/src/index.tsx index 09d3aec6..8e49df9f 100644 --- a/ui/src/index.tsx +++ b/ui/src/index.tsx @@ -2,7 +2,7 @@ import { render, Component } from 'inferno'; import { BrowserRouter, Route, Switch } from 'inferno-router'; import { Provider } from 'inferno-i18next'; import { Main } from './components/main'; -import Navbar from './components/navbar'; +import { Navbar } from './components/navbar'; import { Footer } from './components/footer'; import { Login } from './components/login'; import { CreatePost } from './components/create-post'; -- cgit v1.2.3 From aab68f0bafacb88f6c542a98d2a0f3cdb0de20b3 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 3 Jul 2020 17:56:50 -0400 Subject: Adding to sponsors list. --- ui/src/components/sponsors.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/src/components/sponsors.tsx b/ui/src/components/sponsors.tsx index 4561bc30..31a4ee5e 100644 --- a/ui/src/components/sponsors.tsx +++ b/ui/src/components/sponsors.tsx @@ -10,6 +10,7 @@ interface SilverUser { } let general = [ + 'dude in phx', 'twilight loki', 'Andrew Plaza', 'Jonathan Cremin', -- cgit v1.2.3 From 69df9cecca357989ef4a5c056b67bd252641df01 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 3 Jul 2020 22:00:51 -0400 Subject: Adding a search icon, and a faster transition. --- ui/assets/css/main.css | 4 ++-- ui/src/components/navbar.tsx | 25 +++++++++++++------------ ui/src/components/symbols.tsx | 4 ++-- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/ui/assets/css/main.css b/ui/assets/css/main.css index a05f5a8b..fd65148c 100644 --- a/ui/assets/css/main.css +++ b/ui/assets/css/main.css @@ -252,7 +252,7 @@ pre { .form-control.search-input { float: right !important; - transition: width 0.5s ease-out 0s !important; + transition: width 0.2s ease-out 0s !important; } .show-input { @@ -263,4 +263,4 @@ pre { background: transparent !important; width: 0px !important; padding: 0 !important; - } \ No newline at end of file + } diff --git a/ui/src/components/navbar.tsx b/ui/src/components/navbar.tsx index 7c72d6cd..53b085e5 100644 --- a/ui/src/components/navbar.tsx +++ b/ui/src/components/navbar.tsx @@ -245,21 +245,22 @@ export class Navbar extends Component { placeholder={i18n.t('search')} onBlur={linkEvent(this, this.handleSearchBlur)} > -
      - -
      +
      )} -
        +
          {this.canAdmin && ( -
        • +
        • { )} {this.state.isLoggedIn ? ( <> -
        • +
        • diff --git a/ui/src/components/symbols.tsx b/ui/src/components/symbols.tsx index cdb7436a..77d7a086 100644 --- a/ui/src/components/symbols.tsx +++ b/ui/src/components/symbols.tsx @@ -159,8 +159,8 @@ export class Symbols extends Component { /> - - + + -- cgit v1.2.3 From e95992b704be7132e3d482cec4c7117e3172c4b1 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 3 Jul 2020 22:26:49 -0400 Subject: Version v0.7.9 --- ansible/VERSION | 2 +- docker/prod/docker-compose.yml | 2 +- server/src/version.rs | 2 +- ui/src/version.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/VERSION b/ansible/VERSION index 151a6866..a502cc62 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.7.8 +v0.7.9 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index bc05a2b4..fe91084b 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.7.8 + image: dessalines/lemmy:v0.7.9 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/server/src/version.rs b/server/src/version.rs index 83d604cd..c5c41270 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.7.8"; +pub const VERSION: &str = "v0.7.9"; diff --git a/ui/src/version.ts b/ui/src/version.ts index 709137ef..69dc4281 100644 --- a/ui/src/version.ts +++ b/ui/src/version.ts @@ -1 +1 @@ -export const version: string = 'v0.7.8'; +export const version: string = 'v0.7.9'; -- cgit v1.2.3 From 1bd7218a7e750f430497720e6dd6ae9cd68acff8 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 3 Jul 2020 23:39:43 -0400 Subject: Adding an issue template. --- .github/ISSUE_TEMPLATE/BUG_REPORT.md | 27 ++++++++++++++++++++ .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md | 42 +++++++++++++++++++++++++++++++ .github/ISSUE_TEMPLATE/QUESTION.md | 11 ++++++++ 3 files changed, 80 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/BUG_REPORT.md create mode 100644 .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md create mode 100644 .github/ISSUE_TEMPLATE/QUESTION.md diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md new file mode 100644 index 00000000..e9cceb71 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md @@ -0,0 +1,27 @@ +--- +name: "🐞 Bug Report" +about: Create a report to help us improve Lemmy +title: '' +labels: 'type:bug' +assignees: '' + +--- + +Found a bug? Please fill out the sections below. 👍 + +### Issue Summary + +A summary of the bug. + + +### Steps to Reproduce + +1. (for example) I clicked login, and an endless spinner show up. +2. I tried to install lemmy via this guide, and I'm getting this error. +3. ... + +### Technical details + +* Please post your log: `sudo docker-compose logs > lemmy_log.out`. +* What OS are you trying to install lemmy on? +* Any browser console errors? diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md new file mode 100644 index 00000000..d2612560 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md @@ -0,0 +1,42 @@ +--- +name: "🚀 Feature request" +about: Suggest an idea for improving Lemmy +title: '' +labels: 'type:enhancement' +assignees: '' + +--- + +### Is your proposal related to a problem? + + + +(Write your answer here.) + +### Describe the solution you'd like + + + +(Describe your proposed solution here.) + +### Describe alternatives you've considered + + + +(Write your answer here.) + +### Additional context + + + +(Write your answer here.) diff --git a/.github/ISSUE_TEMPLATE/QUESTION.md b/.github/ISSUE_TEMPLATE/QUESTION.md new file mode 100644 index 00000000..e81ee01d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/QUESTION.md @@ -0,0 +1,11 @@ +--- +name: "? Question" +about: General questions about Lemmy +title: '' +labels: 'type:question' +assignees: '' + +--- + +What's the question you have about lemmy? + -- cgit v1.2.3 From 00870dfb5e371483ad20247aefa2004a61fa385d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=ABr=C3=AB=20R=C3=ABr=C3=AB?= Date: Sat, 4 Jul 2020 09:17:24 +0000 Subject: Translated using Weblate (Albanian) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sq/ Translated using Weblate (Albanian) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sq/ Translated using Weblate (Albanian) Currently translated at 100.0% (249 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sq/ Translated using Weblate (Albanian) Currently translated at 55.8% (139 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/sq/ --- ui/translations/sq.json | 186 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 169 insertions(+), 17 deletions(-) diff --git a/ui/translations/sq.json b/ui/translations/sq.json index 0526fa26..2b525445 100644 --- a/ui/translations/sq.json +++ b/ui/translations/sq.json @@ -1,8 +1,8 @@ { "remove_post": "Hiqe Postimin", "no_posts": "Nuk ka Postime.", - "create_a_post": "Krijo një postim", - "create_post": "Krijo Postimin", + "create_a_post": "Krijo Postim", + "create_post": "Krijo Postim", "posts": "Postime", "related_posts": "Këto postime mund të jenë të lidhura", "cross_posts": "Ky link është postuar edhe te:", @@ -12,16 +12,16 @@ "remove_comment": "Fshije Komentin", "communities": "Komunitetet", "users": "Përdoruesit", - "create_a_community": "Krijo një komunitet", + "create_a_community": "Krijo një Komunitet", "select_a_community": "Përzgjedh një komunitet", - "create_community": "Krijo komunitetin", + "create_community": "Krijo Komunitet", "remove_community": "Fshije Komunitetin", - "subscribed_to_communities": "I abonuar në", - "trending_communities": "Trendi", + "subscribed_to_communities": "Jeni abonuar në <1>communities", + "trending_communities": "Komunitetet në trend <1>communities", "list_of_communities": "Lista e komuniteteve", "community_reqs": "gërma të vogla, nënvizim, dhe pa hapësira.", "invalid_community_name": "Emër invalid.", - "create_private_message": "Krijo Mesazh Privat", + "create_private_message": "Shkruaji Mesazh Privat", "send_secure_message": "Dërgo Mesazh të Sigurtë", "send_message": "Dërgo Mesazh", "message": "Mesazh", @@ -63,15 +63,15 @@ "delete_account": "Fshije Account-in", "click_to_delete_picture": "Shtyp për të fshirë imazhin.", "picture_deleted": "Imazhi është fshirë.", - "restore": "rikthe", - "ban": "", - "ban_from_site": "", + "restore": "riktheje", + "ban": "dëboje", + "ban_from_site": "dëboje nga faqja", "save": "ruaj", - "unsave": "anulo ruajtjen", + "unsave": "hiqe", "create": "krijo", "creator": "krijuesi", - "username": "Emri virtual", - "email_or_username": "Email-i ose Emri virtual", + "username": "Emri Virtual", + "email_or_username": "Email-i ose Emri Virtual", "number_of_users": "{{count}} Përdorues", "number_of_users_plural": "{{count}} Përdoruesa", "number_of_subscribers": "{{count}} i abonuar", @@ -89,7 +89,7 @@ "subscribe": "Abonohu", "subscribed": "Jeni abonuar", "next": "Tjetra", - "post": "postim", + "post": "publiko", "number_of_posts": "{{count}} Postim", "number_of_posts_plural": "{{count}} Postime", "number_of_comments": "{{count}} Koment", @@ -101,8 +101,160 @@ "moderates": "Moderon", "admin_settings": "Konfigurimet administrative", "remove_as_admin": "largoje si administrator", - "deleted": "është fshirë nga krijuesi", + "deleted": "është fshirë nga autori", "delete_account_confirm": "Paralajmërim: kjo do të fshij të gjitha të dhënat e juaja përgjithmonë. Shtyp fjalëkalimin tënd për ta konfirmuar.", - "unsubscribe": "Çabonohu", - "prev": "E mëparshme" + "unsubscribe": "Ndalo Abonimin", + "prev": "E mëparshmja", + "to": "në", + "by": "nga", + "joined": "U anëtarësuat", + "code": "Kodi", + "monero": "Monero", + "bitcoin": "Bitcoin", + "crypto": "Crypto", + "general_sponsors": "Sponsorët General janë ata që dhuruan $10 deri $39 për Lemmy.", + "donate": "Dhuroni", + "donate_to_lemmy": "Dhuroji Lemmy-it", + "support_on_open_collective": "Na përkrahni në OpenCollective", + "support_on_liberapay": "Na përkrahni në Liberapay", + "support_on_patreon": "Na përkrahni në Patreon", + "sponsors_of_lemmy": "Sponsorët e Lemmy", + "sponsors": "Sponsorët", + "show_nsfw": "Shfaq përmbajtje NSFW", + "modified": "e modifikuar", + "your_site": "faqja jote", + "couldnt_update_community": "Komuniteti nuk mundi të përditësohej.", + "couldnt_find_community": "Komuniteti nuk mund të gjendej.", + "no_post_edit_allowed": "Nuk lejohet redaktimi i postimit.", + "no_comment_edit_allowed": "Nuk të lejohet redaktimi i komentit.", + "couldnt_get_comments": "Nuk mund të merrnim komentet.", + "couldnt_update_comment": "Përditësimi i komentit nuk ishte i mundshëm.", + "couldnt_like_comment": "Pëlqimi i komentit nuk ishte i mundshëm.", + "couldnt_create_comment": "Krijimi i komentit nuk ishte i mundshëm.", + "site_saved": "Faqja është ruajtur.", + "logged_in": "Jeni kyçur.", + "not_logged_in": "Nuk jeni kyçur.", + "powered_by": "Fuqizuar nga", + "no": "jo", + "yes": "po", + "are_you_sure": "a je i sigurt?", + "transfer_site": "faqe transferimi", + "transfer_community": "komunitet transferimi", + "block_leaving": "A je i sigurt se do të dalësh?", + "emoji_picker": "Zgjedh Emoji", + "action": "Veprim", + "time": "Koha", + "couldnt_update_private_message": "Nuk mundëm të përditësonim mesazhin privat.", + "no_private_message_edit_allowed": "Nuk lejohet redaktimi i mesazhit privat.", + "couldnt_create_private_message": "Nuk mund të krijohej mesazhi privat.", + "system_err_login": "Gabim sistemi. Provo të shkyçesh dhe të kyçesh përsëri.", + "couldnt_update_user": "Përditësimi i përdoruesit nuk ishte i mundshëm.", + "invalid_username": "Emri virtual është invalid.", + "passwords_dont_match": "Fjalëkalimet nuk janë të njëjta.", + "password_incorrect": "Fjalëkalimi është i pasaktë.", + "couldnt_find_that_username_or_email": "Nuk mund të gjendej ky emër virtual ose email.", + "couldnt_update_site": "Faqja nuk mund të përditësohej.", + "not_an_admin": "Nuk je administrator.", + "no_slurs": "Nuk lejohen sharjet.", + "couldnt_save_post": "Postimi nuk u ruajt.", + "couldnt_update_post": "Postimi nuk mundi të përditësohej", + "couldnt_get_posts": "Nuk mund të merreshin postimet", + "couldnt_find_post": "Nuk mund të gjendeshin postimet.", + "couldnt_like_post": "Nuk mund të pëlqehej postimi.", + "post_title_too_long": "Titulli i postimit ishte shumë i gjatë.", + "couldnt_create_post": "Nuk mund të krijohej postimi.", + "no_community_edit_allowed": "Nuk të lejohet redaktimi i komunitetit.", + "couldnt_save_comment": "Ruajtja e komentit nuk ishte e mundshme.", + "landing": "Lemmy është një <1>grumbullues linqesh / alternativë e reddit-it, e hartuar që të punoj në <2>fediverse-in.<3>Është self-hostable, ka komente që përditësohen në kohë reale, dhe është shumë i vogël (<4>~80kB). Federimi në ActivityPub është i planifikuar në të ardhmen e afërt. <5>Ky është <6>një version shumë i hershëm beta, dhe shumë funksione janë të prishura ose mungojnë. <7>Jep sugjerime të reja ose raporto probleme <8>këtu.<9>Krijuar me <10>Rust, <11>Actix, <12>Inferno, <13>Typescript.", + "from": "nga", + "ethereum": "Ethereum", + "silver_sponsors": "Sponsorët e Argjendtë janë ata që dhuruan $40 për Lemmy.", + "sponsor_message": "Lemmy është softuer <1>open-source, falas, pa reklama, pagesë, apo kapital të sipërmarrjes, përgjithmonë. Donacionet tuaja mbështesin zhvillimin konstant të projektit. Falënderojmë njerëzit në vijim:", + "unban": "anuloje dëbimin", + "unban_from_site": "anuloje dëbimin nga faqja", + "banned_users": "Pëdoruesit e dëbuar", + "banned": "të dëbuar", + "sidebar": "Informatat anësore", + "sort_type": "Radhit sipas", + "new": "Të rejat", + "old": "Të vjetrat", + "week": "Javës", + "month": "Muajit", + "year": "Vitit", + "api": "API", + "inbox": "Kutia e njoftimeve", + "inbox_for": "Kutia e njoftimeve për <1>{{user}}", + "type": "Lloji", + "unread": "Të palexuara", + "message_sent": "Mesazhi u dërgua", + "search": "Kërko", + "view": "Shiko", + "logout": "Shkyçu", + "top": "Top", + "login_sign_up": "Kyçu / Regjistrohu", + "login": "Kyçu", + "sign_up": "Regjistrohu", + "hot": "Popullore", + "top_day": "Më të pëlqyerat e ditës", + "docs": "Dokumentimi", + "replies": "Përgjigjet", + "mentions": "Përmendur", + "reply_sent": "Përgjigja u dërgua", + "messages": "Mesazhet", + "password": "Fjalëkalimi", + "old_password": "Fjalëkalimi i vjetër", + "forgot_password": "harrova fjalëkalimin", + "password_change": "Ndrysho Fjalëkalimin", + "new_password": "Fjalëkalimi i ri", + "no_email_setup": "Ky server nuk e ka konfiguruar Email-in saktësisht.", + "email": "Email", + "matrix_user_id": "Përdorues i Matrix-it", + "send_notifications_to_email": "Dërgo njoftimet në Email", + "expires": "Skadon", + "language": "Gjuha", + "enable_downvotes": "Lejo votat negative", + "number_of_upvotes": "{{count}} Votë pozitive", + "number_of_upvotes_plural": "{{count}} Vota pozitive", + "number_of_downvotes": "{{count}} Votë negative", + "number_of_downvotes_plural": "{{count}} Vota negative", + "open_registration": "Hape regjistrimin", + "enable_nsfw": "Lejo përmbajtje NSFW", + "url": "URL", + "body": "Teksti", + "community": "Komuniteti", + "expand_here": "Zgjero këtu", + "subscribe_to_communities": "Abonohu në disa <1>communities.", + "verify_password": "Konfirmo Fjalëkalimin", + "optional": "E padetyrueshme", + "browser_default": "Parazgjedhur nga shfletuesi", + "downvotes_disabled": "Votat negative janë të çaktivizuara", + "upvote": "Votë pozitive", + "downvote": "Votë negative", + "registration_closed": "Regjistrimi u mbyll", + "chat": "Chat", + "recent_comments": "Komentet më të reja", + "no_results": "S'ka rezultate.", + "setup": "Konfigurimi", + "setup_admin": "Emëro një administrator të faqes", + "nsfw": "NSFW", + "theme": "Pamja", + "lemmy_instance_setup": "Konfigurimi i një instance të Lemmy-it", + "community_ban": "Jeni dëbuar nga ky komunitet.", + "site_ban": "Jeni dëbuar nga kjo faqe", + "community_already_exists": "Komuniteti ekziston më.", + "community_moderator_already_exists": "Moderatori i komunitetit tashmë ekziston.", + "community_follower_already_exists": "Ndjekësi i komunitetit tashmë ekziston.", + "community_user_already_banned": "Anëtari i komunitetit tashmë është dëbuar.", + "site_already_exists": "Faqja tashmë ekziston.", + "user_already_exists": "Përdoruesi tashmë ekziston.", + "email_already_exists": "Email-i tashmë ekziston.", + "admin_already_created": "Kërkojmë ndjesë, por tashmë është një administrator.", + "all": "Gjithçka", + "mark_all_as_read": "shëno të gjitha si të lexuara", + "overview": "Shiko në përgjithësi", + "notifications_error": "Njoftimet në desktop nuk janë të mundshme në shfletuesin tuaj. Provoni Firefox ose Chrome.", + "unread_messages": "Mesazhet e palexuara", + "reset_password_mail_sent": "Një Email është dërguar për të ndryshuar fjalëkalimin tuaj.", + "private_message_disclaimer": "Paralajmërim: Mesazhet private në Lemmy nuk janë të siguruara. Ju lutem krijoni një account në <1>Riot.im për të dërguar mesazhe të sigurta.", + "copy_suggested_title": "kopjo titullin e sugjeruar: {{title}}" } -- cgit v1.2.3 From cc438980d1175fa51567b26bafe438fe69124bf2 Mon Sep 17 00:00:00 2001 From: Cee Date: Sat, 4 Jul 2020 09:17:24 +0000 Subject: Translated using Weblate (Chinese (Simplified)) Currently translated at 98.7% (246 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/zh_Hans/ Translated using Weblate (Chinese (Simplified)) Currently translated at 98.7% (246 of 249 strings) Translation: Lemmy/lemmy Translate-URL: http://weblate.yerbamate.dev/projects/lemmy/lemmy/zh_Hans/ --- ui/translations/zh.json | 66 ++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/ui/translations/zh.json b/ui/translations/zh.json index def3b05c..ddf40222 100644 --- a/ui/translations/zh.json +++ b/ui/translations/zh.json @@ -24,29 +24,29 @@ "unlock": "解锁", "lock": "加锁", "link": "链接", - "mod": "监管人", - "mods": "监管人", + "mod": "社群管理", + "mods": "社群管理", "moderates": "监管", - "remove_as_mod": "添加监管人", - "appoint_as_mod": "移除监管人", - "modlog": "监管记录", - "admin": "管理权限", - "admins": "管理权限", - "remove_as_admin": "移除管理权限", - "appoint_as_admin": "添加管理权限", + "remove_as_mod": "删除社群管理", + "appoint_as_mod": "任命为社群管理", + "modlog": "审核记录", + "admin": "总管理员", + "admins": "总管理员", + "remove_as_admin": "移除管理员权限", + "appoint_as_admin": "添加管理员权限", "remove": "移除", - "removed": "已被管理员移除", - "locked": "已加锁", + "removed": "已被社群管理移除", + "locke