Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

translations via mastodon api #3228

Closed
wants to merge 11 commits into from
Closed

translations via mastodon api #3228

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3e272cd
try to add basic for translation via mastodon API
Joshix-1 Jan 27, 2023
551efba
try to make stuff work
Joshix-1 Jan 27, 2023
21ccc96
Add translate option in menu
Joshix-1 Jan 28, 2023
1fe33eb
improve translation display
Joshix-1 Jan 28, 2023
ac8e5d1
try to make more things work
Joshix-1 Jan 28, 2023
9ca7a8e
lint
Joshix-1 Jan 28, 2023
0c3289b
Merge remote-tracking branch 'origin/develop' into native-mastodon-tr…
Joshix-1 Aug 21, 2023
7c70efe
refactor translate methods
Joshix-1 Aug 22, 2023
eee64ae
update
Joshix-1 Aug 28, 2023
e8df5d2
Merge remote-tracking branch 'origin/develop' into native-mastodon-tr…
Joshix-1 Sep 21, 2023
af4f598
test stuff
Joshix-1 Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
lint
  • Loading branch information
@Joshix-1
Joshix-1 committed Jan 28, 2023
commit 9ca7a8e3c9cab3ccce37db20571207e88dd04325
2 changes: 1 addition & 1 deletion app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import com.keylesspalace.tusky.entity.Status
import com.keylesspalace.tusky.entity.TimelineAccount
import com.keylesspalace.tusky.entity.TranslationResult
import com.keylesspalace.tusky.viewdata.StatusViewData
import java.util.*
import java.util.Date

@Entity(primaryKeys = ["id", "accountId"])
@TypeConverters(Converters::class)
Expand Down
12 changes: 7 additions & 5 deletions app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,13 @@ class SearchViewModel @Inject constructor(
if (alreadyTranslated)
return timelineCases.dispatchNullTranslation(statusViewData.actionableId)
timelineCases.translate(statusViewData.actionableId)
.onErrorReturnItem(TranslationResult(
statusViewData.status.content,
statusViewData.status.language ?: "null",
"<error>"
))
.onErrorReturnItem(
TranslationResult(
statusViewData.status.content,
statusViewData.status.language ?: "null",
"<error>",
)
)
.subscribe()
.autoDispose()
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineTypeMappers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import com.keylesspalace.tusky.entity.Poll
import com.keylesspalace.tusky.entity.Status
import com.keylesspalace.tusky.entity.TimelineAccount
import com.keylesspalace.tusky.viewdata.StatusViewData
import java.util.*
import java.util.Date

private const val TAG = "TimelineTypeMappers"

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/keylesspalace/tusky/db/Converters.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import com.keylesspalace.tusky.entity.Status
import com.keylesspalace.tusky.entity.TranslationResult
import java.net.URLDecoder
import java.net.URLEncoder
import java.util.*
import java.util.Date
import javax.inject.Inject
import javax.inject.Singleton

Expand Down