Mastodon
/
Yuito-app-android
mirror of https://github.com/accelforce/Yuito
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop'

This commit is contained in:
kyori19 2019-12-08 00:47:56 +09:00
parent 6f1e7fb74b d0ce43dfca
commit 5a7389d1aa
14 changed files with 87 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/keylesspalace/tusky/TabData.kt
View File

@ -21,7 +21,6 @@ import androidx.fragment.app.Fragment
import com.keylesspalace.tusky.components.conversation.ConversationsFragment
import com.keylesspalace.tusky.fragment.NotificationsFragment
import com.keylesspalace.tusky.fragment.TimelineFragment
import java.net.URLDecoder
/** this would be a good case for a sealed class, but that does not work nice with Room */
@ -47,7 +46,7 @@ fun createTabDataFromId(id: String, arguments: List<String> = emptyList()): TabD
FEDERATED -> TabData(FEDERATED, R.string.title_public_federated, R.drawable.ic_public_24dp, { TimelineFragment.newInstance(TimelineFragment.Kind.PUBLIC_FEDERATED) })
DIRECT -> TabData(DIRECT, R.string.title_direct_messages, R.drawable.reblog_direct_dark, { ConversationsFragment.newInstance() })
HASHTAG -> TabData(HASHTAG, R.string.hashtag, R.drawable.ic_hashtag, { args -> TimelineFragment.newInstance(TimelineFragment.Kind.TAG, args.getOrNull(0).orEmpty()) }, arguments)
LIST -> TabData(LIST, R.string.list, R.drawable.ic_list, { args -> TimelineFragment.newInstance(TimelineFragment.Kind.LIST, args.getOrNull(0).orEmpty()) }, arguments.map { URLDecoder.decode(it, "UTF-8") })
LIST -> TabData(LIST, R.string.list, R.drawable.ic_list, { args -> TimelineFragment.newInstance(TimelineFragment.Kind.LIST, args.getOrNull(0).orEmpty()) }, arguments)
else -> throw IllegalArgumentException("unknown tab type")
}
}

3
app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt
View File

@ -16,6 +16,7 @@
package com.keylesspalace.tusky
import android.os.Bundle
import android.util.Log
import android.view.MenuItem
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.AppCompatEditText
@ -220,7 +221,7 @@ class TabPreferenceActivity : BaseActivity(), Injectable, ItemInteractionListene
adapter.addAll(lists)
},
{ throwable ->
throwable.printStackTrace()
Log.e("TabPreferenceActivity", "failed to load lists", throwable)
}
)

2
app/src/main/java/com/keylesspalace/tusky/adapter/ListSelectionAdapter.kt
View File

@ -39,7 +39,7 @@ class ListSelectionAdapter(context: Context) : ArrayAdapter<MastoList>(context,
if (list != null) {
val title = view.title
title.text = list.title
val icon = ThemeUtils.getTintedDrawable(context, R.drawable.ic_list, android.R.attr.textColorPrimary)
val icon = ThemeUtils.getTintedDrawable(context, R.drawable.ic_list, android.R.attr.textColorTertiary)
title.setCompoundDrawablesRelativeWithIntrinsicBounds(icon, null, null, null)
}

3
app/src/main/java/com/keylesspalace/tusky/db/Converters.kt
View File

@ -28,6 +28,7 @@ import com.keylesspalace.tusky.entity.Poll
import com.keylesspalace.tusky.entity.Status
import com.keylesspalace.tusky.json.SpannedTypeAdapter
import com.keylesspalace.tusky.util.HtmlUtils
import java.net.URLDecoder
import java.net.URLEncoder
import java.util.*
@ -62,7 +63,7 @@ class Converters {
return str?.split(";")
?.map {
val data = it.split(":")
createTabDataFromId(data[0], data.drop(1))
createTabDataFromId(data[0], data.drop(1).map { s -> URLDecoder.decode(s, "UTF-8") })
}
}

7
app/src/main/res/values-ar/strings.xml
View File

@ -490,4 +490,9 @@
<string name="hint_configure_scheduled_toot">اضغط هنا لضبط برمجة التبويق.</string>
<string name="post_lookup_error_format">خطأ أثناء البحث عن منشور %s</string>
</resources>
<string name="title_bookmarks">الفواصل المرجعية</string>
<string name="action_bookmark">أضفه إلى الفواصل المرجعية</string>
<string name="action_view_bookmarks">الفواصل المرجعية</string>
<string name="about_powered_by_tusky">مدعوم بِـ Tusky</string>
<string name="description_status_bookmarked">أضيف إلى الفواصل المرجعية</string>
</resources>

4
app/src/main/res/values-es/strings.xml
View File

@ -469,4 +469,8 @@
<string name="post_lookup_error_format">Error al buscar el post %s</string>
<string name="about_powered_by_tusky">Potenciado por Tusky</string>
<string name="title_bookmarks">Favoritos</string>
<string name="action_bookmark">Favorito</string>
<string name="action_view_bookmarks">Favoritos</string>
<string name="description_status_bookmarked">Marcado como favorito</string>
</resources>

19
app/src/main/res/values-eu/strings.xml
View File

@ -364,13 +364,13 @@
<string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
<plurals name="favs">
<item quantity="one"><b>%1$s</b> Gogoko</item>
<item quantity="other"><b>%1$s</b> Gogoko</item>
<item quantity="one">&lt;b&gt;%1$s&lt;/b&gt; Gogoko</item>
<item quantity="other">&lt;b&gt;%1$s&lt;/b&gt; Gogoko</item>
</plurals>
<plurals name="reblogs">
<item quantity="one"><b>%s</b> Bultzada</item>
<item quantity="other"><b>%s</b> Bultzada</item>
<item quantity="one">&lt;b&gt;%s&lt;/b&gt; Bultzada</item>
<item quantity="other">&lt;b&gt;%s&lt;/b&gt; Bultzada</item>
</plurals>
<string name="title_reblogged_by">Bultzatuta</string>
@ -443,7 +443,7 @@
<string name="button_done">Eginda</string>
<string name="report_sent_success">\@%s jakinarazi duzu arrakastaz</string>
<string name="hint_additional_info">Iruzkin gehigarriak</string>
<string name="report_remote_instance">%s-(r)i birbidali</string>
<string name="report_remote_instance">%s(r)i birbidali</string>
<string name="failed_report">Txostena huts egin du</string>
<string name="failed_fetch_statuses">Egoeren eskuratzea huts egin du</string>
<string name="report_description_1">Txostena zure zerbitzariaren moderatzaileari bidaliko zaio. Jarraian, kontu honen zergatia salatzen duzun azalpena eman dezakezu:</string>
@ -468,4 +468,11 @@
<string name="edit_poll">Editatu</string>
<string name="post_lookup_error_format">Errorea agertu da %s mezua bilatzean</string>
</resources>
<string name="title_bookmarks">Laster-markak</string>
<string name="action_bookmark">Laster-marka</string>
<string name="action_view_bookmarks">Laster-markak</string>
<string name="action_open_reblogger">Ireki bultzadaren egilea</string>
<string name="pref_title_public_filter_keywords">Denbora lerro publikoak</string>
<string name="description_status_bookmarked">Laster-markatuta</string>
<string name="poll_info_time_relative">%s geratzen da</string>
</resources>

4
app/src/main/res/values-fr/strings.xml
View File

@ -476,4 +476,8 @@
<string name="post_lookup_error_format">Erreur lors de la recherche du post %s</string>
<string name="about_powered_by_tusky">Propulsé par Tusky</string>
<string name="title_bookmarks">Signets</string>
<string name="action_bookmark">Marquer comme signet</string>
<string name="action_view_bookmarks">Signets</string>
<string name="description_status_bookmarked">Marqué comme un signet</string>
</resources>

4
app/src/main/res/values-ko/strings.xml
View File

@ -400,11 +400,11 @@
<string name="pin_action">고정</string>
<plurals name="favs">
<item quantity="other"><b>%1$s</b> 즐겨찾기</item>
<item quantity="other">&lt;b&gt;%1$s&lt;/b&gt; 즐겨찾기</item>
</plurals>
<plurals name="reblogs">
<item quantity="other"><b>%s</b> 부스트</item>
<item quantity="other">&lt;b&gt;%s&lt;/b&gt; 부스트</item>
</plurals>
<string name="title_reblogged_by">부스트한 유저</string>

4
app/src/main/res/values-no-rNB/strings.xml
View File

@ -511,4 +511,8 @@
<string name="post_lookup_error_format">Det oppsto en feil under henting av %s</string>
<string name="about_powered_by_tusky">Drevet av Tusky</string>
<string name="title_bookmarks">Bokmerker</string>
<string name="action_bookmark">Bokmerke</string>
<string name="action_view_bookmarks">Bokmerker</string>
<string name="description_status_bookmarked">Bokmerke lagt til</string>
</resources>

4
app/src/main/res/values-oc/strings.xml
View File

@ -481,4 +481,8 @@
<string name="post_lookup_error_format">Error en cercant la publicacion %s</string>
<string name="about_powered_by_tusky">Propulsat per Tusky</string>
<string name="title_bookmarks">Marcapaginas</string>
<string name="action_bookmark">Ajustar als marcapaginas</string>
<string name="action_view_bookmarks">Marcapaginas</string>
<string name="description_status_bookmarked">Ajustat als marcapaginas</string>
</resources>

18
app/src/main/res/values-pl/strings.xml
View File

@ -368,15 +368,15 @@
<string name="pin_action">Przypnij do profilu</string>
<plurals name="favs">
<item quantity="one"><b>%1$s</b> polubienie</item>
<item quantity="few"><b>%1$s</b> polubienia</item>
<item quantity="many"><b>%1$s</b> polubień</item>
<item quantity="one">&lt;b>%1$s&lt;/b&gt; polubienie</item>
<item quantity="few">&lt;b>%1$s&lt;/b&gt; polubienia</item>
<item quantity="many">&lt;b>%1$s&lt;/b&gt; polubień</item>
</plurals>
<plurals name="reblogs">
<item quantity="one"><b>%s</b> podbicie</item>
<item quantity="few"><b>%s</b> podbicia</item>
<item quantity="many"><b>%s</b> podbić</item>
<item quantity="one">&lt;b&gt;%s&lt;/b&gt; podbicie</item>
<item quantity="few">&lt;b&gt;%s&lt;/b&gt; podbicia</item>
<item quantity="many">&lt;b&gt;%s&lt;/b&gt; podbić</item>
</plurals>
<string name="title_reblogged_by">Podbite przez</string>
@ -488,4 +488,8 @@
<string name="about_powered_by_tusky">Napędzane przez Tusky</string>
<string name="post_lookup_error_format">Błąd przy wyszukiwaniu wpisu %s</string>
</resources>
<string name="title_bookmarks">Zakładki</string>
<string name="action_bookmark">Zakładka</string>
<string name="action_view_bookmarks">Zakładki</string>
<string name="description_status_bookmarked">Dodane do zakładek</string>
</resources>

55
app/src/main/res/values-pt-rBR/strings.xml
View File

@ -23,8 +23,8 @@
<string name="title_public_local">Local</string>
<string name="title_public_federated">Global</string>
<string name="title_direct_messages">Mensagens diretas</string>
<string name="title_tab_preferences">Abas</string>
<string name="title_view_thread">Sequência</string>
<string name="title_tab_preferences">Editar abas</string>
<string name="title_view_thread">Conversa</string>
<string name="title_statuses">Toots</string>
<string name="title_statuses_with_replies">Com respostas</string>
<string name="title_follows">Segue</string>
@ -37,7 +37,7 @@
<string name="title_saved_toot">Rascunhos</string>
<string name="title_licenses">Licenças</string>
<string name="status_boosted_format">%s deu boost</string>
<string name="status_sensitive_media_title">Conteúdo sensível</string>
<string name="status_sensitive_media_title">Mídia sensível</string>
<string name="status_media_hidden_title">Mídia oculta</string>
<string name="status_sensitive_media_directions">Toque para ver</string>
<string name="status_content_warning_show_more">Mostrar mais</string>
@ -96,7 +96,7 @@
<string name="action_search">Pesquisar</string>
<string name="action_access_saved_toot">Rascunhos</string>
<string name="action_toggle_visibility">Privacidade do toot</string>
<string name="action_content_warning">Aviso de conteúdo</string>
<string name="action_content_warning">Aviso de Conteúdo</string>
<string name="action_emoji_keyboard">Teclado de emojis</string>
<string name="action_add_tab">Adicionar aba</string>
<string name="action_links">Links</string>
@ -119,7 +119,7 @@
<string name="status_sent_long">Resposta enviada com sucesso.</string>
<string name="hint_domain">Qual instância?</string>
<string name="hint_compose">No que você está pensando?</string>
<string name="hint_content_warning">Aviso de conteúdo</string>
<string name="hint_content_warning">Aviso de Conteúdo aqui</string>
<string name="hint_display_name">Nome de exibição</string>
<string name="hint_note">Biografia</string>
<string name="hint_search">Pesquisar…</string>
@ -129,9 +129,9 @@
<string name="label_header">Capa</string>
<string name="link_whats_an_instance">O que é uma instância?</string>
<string name="login_connection">Conectando…</string>
<string name="dialog_whats_an_instance">O endereço ou domínio de qualquer instância pode ser inserido aqui, como mastodon.social, icosahedron.website, social.tchncs.de ou qualquer <a href="https://instances.social">outro!</a>
<string name="dialog_whats_an_instance">O domínio de qualquer instância pode ser inserido aqui, como mastodon.social, masto.donte.com.br, colorid.es ou qualquer <a href="https://instances.social">outro!</a>
\n
\n Se você não tem uma conta ainda, você pode inserir o nome da instância a qual você gostaria de participar e criar uma conta lá.
\n Se você não tem uma conta ainda, você pode inserir o nome da instância a qual você gostaria de participar e criar uma conta lá.
\n
\n Uma instância é um lugar onde sua conta é hospedada, mas você pode facilmente se comunicar e seguir pessoas de outras instâncias como se vocês estivessem no mesmo site.
\n
@ -142,8 +142,8 @@
<string name="dialog_message_cancel_follow_request">Recusar o seguidor pendente\?</string>
<string name="dialog_unfollow_warning">Deixar de seguir esta conta?</string>
<string name="dialog_delete_toot_warning">Excluir este toot?</string>
<string name="visibility_public">Público: Postar em timelines públicas</string>
<string name="visibility_unlisted">Não-listado: Não postar em timelines públicas</string>
<string name="visibility_public">Público: Postar em linhas públicas</string>
<string name="visibility_unlisted">Não-listado: Não postar em linhas públicas</string>
<string name="visibility_private">Privado: Postar apenas para seguidores</string>
<string name="visibility_direct">Direto: Postar apenas para usuários mencionados</string>
<string name="pref_title_edit_notification_settings">Editar notificações</string>
@ -153,13 +153,13 @@
<string name="pref_title_notification_alert_vibrate">Notificar com vibração</string>
<string name="pref_title_notification_alert_light">Notificar com luz</string>
<string name="pref_title_notification_filters">Notifique-me quando</string>
<string name="pref_title_notification_filter_mentions">mencionado</string>
<string name="pref_title_notification_filter_follows">seguido</string>
<string name="pref_title_notification_filter_mentions">me mencionarem</string>
<string name="pref_title_notification_filter_follows">me seguirem</string>
<string name="pref_title_notification_filter_reblogs">derem boosts nos meus toots</string>
<string name="pref_title_notification_filter_favourites">favoritarem meus toots</string>
<string name="pref_title_appearance_settings">Aparência</string>
<string name="pref_title_app_theme">Temas</string>
<string name="pref_title_timelines">Timelines</string>
<string name="pref_title_timelines">Linhas do tempo</string>
<string name="app_them_dark">Noturno</string>
<string name="app_theme_light">Diurno</string>
<string name="app_theme_black">AMOLED</string>
@ -168,7 +168,7 @@
<string name="pref_title_browser_settings">Navegador</string>
<string name="pref_title_custom_tabs">Usar abas do Chrome</string>
<string name="pref_title_hide_follow_button">Esconder compositor ao rolar a página</string>
<string name="pref_title_status_filter">Filtragem da timeline</string>
<string name="pref_title_status_filter">Filtro da linha do tempo</string>
<string name="pref_title_status_tabs">Abas</string>
<string name="pref_title_show_boosts">Mostrar boosts</string>
<string name="pref_title_show_replies">Mostrar respostas</string>
@ -239,7 +239,7 @@
<string name="abbreviated_minutes_ago">%dm</string>
<string name="abbreviated_seconds_ago">%ds</string>
<string name="follows_you">Segue você</string>
<string name="pref_title_alway_show_sensitive_media">Sempre mostrar conteúdo sensível</string>
<string name="pref_title_alway_show_sensitive_media">Sempre mostrar mídia sensível</string>
<string name="title_media">Mídia</string>
<string name="replying_to">Respondendo a @%s</string>
<string name="load_more_placeholder_text">carregar mais</string>
@ -247,7 +247,7 @@
<string name="add_account_description">Adicionar nova conta Mastodon</string>
<string name="action_lists">Listas</string>
<string name="title_lists">Listas</string>
<string name="title_list_timeline">Timeline da lista</string>
<string name="title_list_timeline">Linha da lista</string>
<string name="compose_active_account_description">Usando a conta %1$s</string>
<string name="error_failed_set_caption">Falha ao incluir descrição</string>
<string name="action_set_caption">Descrever</string>
@ -312,7 +312,7 @@
<string name="dialog_redraft_toot_warning">Excluir e rascunhar este toot\?</string>
<string name="pref_title_notification_filter_poll">Enquetes terminaram</string>
<string name="pref_title_notification_filter_poll">enquetes terminarem</string>
<string name="pref_title_timeline_filters">Filtros</string>
<string name="pref_title_language">Idioma</string>
@ -322,8 +322,8 @@
<string name="notification_poll_description">Notificar enquetes que já terminaram</string>
<string name="pref_title_public_filter_keywords">Timelines públicas</string>
<string name="pref_title_thread_filter_keywords">Sequências</string>
<string name="pref_title_public_filter_keywords">Linhas públicas</string>
<string name="pref_title_thread_filter_keywords">Conversas</string>
<string name="filter_addition_dialog_title">Criar filtro</string>
<string name="filter_edit_dialog_title">Editar filtro</string>
<string name="filter_dialog_remove_button">Remover</string>
@ -368,7 +368,7 @@
<string name="description_status_media">Mídia: %s</string>
<string name="description_status_cw">Aviso de conteúdo: %s</string>
<string name="description_status_cw">Aviso de Conteúdo: %s</string>
<string name="description_status_media_no_description_placeholder">Sem descrição</string>
<string name="description_status_reblogged">Você deu boost</string>
<string name="description_status_favourited">Favoritado</string>
@ -402,8 +402,8 @@
<string name="poll_vote">Votar</string>
<string name="poll_ended_voted">Uma enquete em que você votou terminou</string>
<string name="poll_ended_created">Uma enquete sua terminou</string>
<string name="poll_ended_voted">Uma enquete que você votou terminou</string>
<string name="poll_ended_created">Sua enquete terminou</string>
<plurals name="poll_timespan_days">
<item quantity="one">%d dia</item>
@ -435,15 +435,15 @@
<string name="report_remote_instance">Encaminhar para %s</string>
<string name="failed_report">Falha na denúncia</string>
<string name="failed_fetch_statuses">Falha ao carregar toots</string>
<string name="report_description_1">A denúncia será enviada para o seu administrador da instância. Você pode explicar por que você denunciou a conta:</string>
<string name="report_description_remote_instance">A conta está em outra instância. Enviar uma cópia anônima da denúncia também\?</string>
<string name="report_description_1">A denúncia será enviada aos moderadores da instância. Você pode explicar por que você denunciou a conta:</string>
<string name="report_description_remote_instance">A conta está em outra instância. Enviar uma cópia anônima da denúncia para lá\?</string>
<string name="title_domain_mutes">Instâncias bloqueadas</string>
<string name="action_view_domain_mutes">Instâncias bloqueadas</string>
<string name="action_mute_domain">Bloquear %s</string>
<string name="confirmation_domain_unmuted">%s desbloqueada</string>
<string name="mute_domain_warning">Você tem certeza de que deseja bloquear tudo de %s\? Você não verá mais conteúdos desta instância em nenhuma timeline pública ou nas suas notificações. Seus seguidores desta instância serão removidos.</string>
<string name="mute_domain_warning">Você tem certeza de que deseja bloquear tudo de %s\? Você não verá mais o conteúdo desta instância em nenhuma linha do tempo pública ou nas suas notificações. Seus seguidores desta instância serão removidos.</string>
<string name="mute_domain_warning_dialog_ok">Bloquear instância</string>
<string name="pref_title_show_notifications_filter">Mostrar filtro de notificações</string>
@ -475,4 +475,9 @@
<string name="hint_configure_scheduled_toot">Toque aqui para agendar</string>
<string name="post_lookup_error_format">Erro ao pesquisar %s</string>
</resources>
<string name="title_bookmarks">Salvos</string>
<string name="action_bookmark">Salvo</string>
<string name="action_view_bookmarks">Salvos</string>
<string name="about_powered_by_tusky">Desenvolvido por Tusky</string>
<string name="description_status_bookmarked">Salvo</string>
</resources>

6
app/src/main/res/values-ru/strings.xml
View File

@ -404,9 +404,9 @@
<string name="pin_action">Закрепить</string>
<plurals name="favs">
<item quantity="one"><b>%1$s</b> Понравилось</item>
<item quantity="few"><b>%1$s</b> Понравились</item>
<item quantity="many"><b>%1$s</b> Понравилось</item>
<item quantity="one">&lt;b&gt;%1$s&lt;/b&gt; Понравилось</item>
<item quantity="few">&lt;b&gt;%1$s&lt;/b&gt; Понравилось</item>
<item quantity="many">&lt;b&gt;%1$s&lt;/b&gt; Понравилось</item>
</plurals>
<plurals name="reblogs">