From 59b977c57ca67a2332640282a3d097fa28d9325a Mon Sep 17 00:00:00 2001 From: Levi Bard Date: Wed, 30 Jun 2021 20:11:14 +0200 Subject: [PATCH 1/3] Fix filtering timelines (#2214) --- .../tusky/components/timeline/TimelineViewModel.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineViewModel.kt index 798939d30..1cc43d02e 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineViewModel.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineViewModel.kt @@ -451,9 +451,9 @@ class TimelineViewModel @Inject constructor( } else { throw HttpException(response) } - } + }.toMutableList() - filterStatuses(statuses.toMutableList()) + filterStatuses(statuses) return statuses } @@ -530,7 +530,7 @@ class TimelineViewModel @Inject constructor( if (statuses.size > 1) { clearPlaceholdersForResponse(mutableStatusResponse) this.statuses.clear() - this.statuses.addAll(statuses.toViewData()) + this.statuses.addAll(mutableStatusResponse.toViewData()) } } From cd39872a29213d508c3db3b8ed60be196d90defa Mon Sep 17 00:00:00 2001 From: Levi Bard Date: Wed, 30 Jun 2021 20:11:37 +0200 Subject: [PATCH 2/3] Update default branch references in the contribution doc (#2215) --- CONTRIBUTING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 428f50eab..47b8c0e7f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -37,15 +37,15 @@ git commit -m "Describe the changes in this commit here." ``` ## Submitting Your Changes -1. Make sure your branch is up-to-date with the ```master``` branch. Run: +1. Make sure your branch is up-to-date with the ```develop``` branch. Run: ``` git fetch -git rebase origin/master +git rebase origin/develop ``` -It may refuse to start the rebase if there's changes that haven't been committed, so make sure you've added and committed everything. If there were changes on master to any of the parts of files you worked on, a conflict will arise when you rebase. [Resolving a merge conflict](https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line) is a good guide to help with this. After committing the resolution, you can run ```git rebase --continue``` to finish the rebase. If you want to cancel, like if you make some mistake in resolving the conflict, you can always do ```git rebase --abort```. +It may refuse to start the rebase if there's changes that haven't been committed, so make sure you've added and committed everything. If there were changes on develop to any of the parts of files you worked on, a conflict will arise when you rebase. [Resolving a merge conflict](https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line) is a good guide to help with this. After committing the resolution, you can run ```git rebase --continue``` to finish the rebase. If you want to cancel, like if you make some mistake in resolving the conflict, you can always do ```git rebase --abort```. 2. Push your local branch to your fork on GitHub by running ```git push origin your-change-name```. -3. Then, go to the original project page and make a pull request. Select your fork/branch and use ```master``` as the base branch. +3. Then, go to the original project page and make a pull request. Select your fork/branch and use ```develop``` as the base branch. 4. Wait for feedback on your pull request and be ready to make some changes If you have any questions, don't hesitate to open an issue or contact [Tusky@mastodon.social](https://mastodon.social/@Tusky). Please also ask before you start implementing a new big feature. From 2766225ba41b4ba315b21037f0b5d1fc0509e3d6 Mon Sep 17 00:00:00 2001 From: Ho Nhat Duy Date: Wed, 23 Jun 2021 10:43:45 +0000 Subject: [PATCH 3/3] Translated using Weblate (Vietnamese) Currently translated at 100.0% (460 of 460 strings) Translation: Tusky/Tusky Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/vi/ --- app/src/main/res/values-vi/strings.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index b18635412..889c65f45 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -237,8 +237,8 @@ Thông báo Thông báo Nhắn tin: Chỉ người được nhắc tới mới thấy - Người theo dõi: Ai đã theo dõi mới được xem - Riêng tư: Không hiện trên bảng tin + Riêng tư: Chỉ người theo dõi mới thấy + Bán công: Không hiện trên bảng tin Công khai: Mọi người đều có thể thấy Ẩn @%s\? Chặn @%s\? @@ -254,8 +254,8 @@ Nhỏ vừa Nhỏ Kích thức phông chữ - Người theo dõi - Riêng tư + Riêng tư + Bán công Công khai Dưới màn hình Trên màn hình @@ -378,7 +378,7 @@ Lượt bình chọn: %1$s, %2$s, %3$s, %4$s; %5$s Tin nhắn Người theo dõi - Riêng tư + Bán công Công khai Đã lưu Đã thích @@ -497,4 +497,6 @@ Ngưng nhận thông báo Nhận thông báo Dù biết tài khoản của bạn công khai, quản trị viên %1$s vẫn nghĩ bạn hãy nên xem lại yêu cầu theo dõi từ những tài khoản lạ. + Xoá cuộc thảo luận này\? + Xoá thảo luận \ No newline at end of file