diff --git a/app/src/main/java/com/jerboa/Utils.kt b/app/src/main/java/com/jerboa/Utils.kt index 371d91511..b927a24d3 100644 --- a/app/src/main/java/com/jerboa/Utils.kt +++ b/app/src/main/java/com/jerboa/Utils.kt @@ -977,22 +977,58 @@ fun convertSpToPx(sp: TextUnit, ctx: Context): Int { * Returns localized Strings for SortingType Enum */ -fun getLocalizedSortingTypeName(ctx: Context, sortingType: SortType): String { - val returnString = when (sortingType) { - SortType.Active -> ctx.getString(R.string.sorttype_active) - SortType.Hot -> ctx.getString(R.string.sorttype_hot) - SortType.New -> ctx.getString(R.string.sorttype_new) - SortType.Old -> ctx.getString(R.string.sorttype_old) - SortType.TopDay -> ctx.getString(R.string.sorttype_topday) - SortType.TopWeek -> ctx.getString(R.string.sorttype_topweek) - SortType.TopMonth -> ctx.getString(R.string.sorttype_topmonth) - SortType.TopYear -> ctx.getString(R.string.sorttype_topyear) - SortType.TopAll -> ctx.getString(R.string.sorttype_topall) - SortType.MostComments -> ctx.getString(R.string.sorttype_mostcomments) - SortType.NewComments -> ctx.getString(R.string.sorttype_newcomments) - } - return returnString -} +fun getLocalizedSortingTypeShortName(ctx: Context, sortingType: SortType): String { + return ctx.getString(MAP_SORT_TYPE_SHORT_FORM[sortingType] ?: throw IllegalStateException("Someone forgot to update the MAP_SORT_TYPE_SHORT_FORM")) +} + +// ORDER MUST BE THE SAME AS THE ENUM +val MAP_SORT_TYPE_SHORT_FORM = mapOf( + SortType.Active to R.string.sorttype_active, + SortType.Hot to R.string.sorttype_hot, + SortType.New to R.string.sorttype_new, + SortType.Old to R.string.sorttype_old, + SortType.TopDay to R.string.sorttype_topday, + SortType.TopWeek to R.string.sorttype_topweek, + SortType.TopMonth to R.string.sorttype_topmonth, + SortType.TopYear to R.string.sorttype_topyear, + SortType.TopAll to R.string.sorttype_topall, + SortType.MostComments to R.string.sorttype_mostcomments, + SortType.NewComments to R.string.sorttype_newcomments, + SortType.TopHour to R.string.sorttype_tophour, + SortType.TopSixHour to R.string.sorttype_topsixhour, + SortType.TopTwelveHour to R.string.sorttype_toptwelvehour, + SortType.TopThreeMonths to R.string.sorttype_topthreemonths, + SortType.TopSixMonths to R.string.sorttype_topsixmonths, + SortType.TopNineMonths to R.string.sorttype_topninemonths, +) + +/** + * Returns localized Strings for SortingType Enum + */ + +fun getLocalizedSortingTypeLongName(ctx: Context, sortingType: SortType): String { + return ctx.getString(MAP_SORT_TYPE_LONG_FORM[sortingType] ?: throw IllegalStateException("Someone forgot to update the MAP_SORT_TYPE_LONG_FORM")) +} + +val MAP_SORT_TYPE_LONG_FORM = mapOf( + SortType.Active to R.string.sorttype_active, + SortType.Hot to R.string.sorttype_hot, + SortType.New to R.string.sorttype_new, + SortType.Old to R.string.sorttype_old, + SortType.TopDay to R.string.dialogs_top_day, + SortType.TopWeek to R.string.dialogs_top_week, + SortType.TopMonth to R.string.dialogs_top_month, + SortType.TopYear to R.string.dialogs_top_year, + SortType.TopAll to R.string.sorttype_topall, + SortType.MostComments to R.string.dialogs_most_comments, + SortType.NewComments to R.string.dialogs_new_comments, + SortType.TopHour to R.string.dialogs_top_hour, + SortType.TopSixHour to R.string.dialogs_top_six_hour, + SortType.TopTwelveHour to R.string.dialogs_top_twelve_hour, + SortType.TopThreeMonths to R.string.dialogs_top_three_month, + SortType.TopSixMonths to R.string.dialogs_top_six_month, + SortType.TopNineMonths to R.string.dialogs_top_nine_month, +) /** * Returns localized Strings for UserTab Enum diff --git a/app/src/main/java/com/jerboa/datatypes/types/Others.kt b/app/src/main/java/com/jerboa/datatypes/types/Others.kt index ca13c97cb..3d2ff4926 100644 --- a/app/src/main/java/com/jerboa/datatypes/types/Others.kt +++ b/app/src/main/java/com/jerboa/datatypes/types/Others.kt @@ -79,7 +79,44 @@ enum class SortType { */ @SerializedName("NewComments") NewComments, + + /** + * Posts sorted by the top hour. + */ + @SerializedName("TopHour") + TopHour, + + /** + * Posts sorted by the top six hour. + */ + @SerializedName("TopSixHour") + TopSixHour, + + /** + * Posts sorted by the top twelve hour. + */ + @SerializedName("TopTwelveHour") + TopTwelveHour, + + /** + * Posts sorted by the top three months. + */ + @SerializedName("TopThreeMonths") + TopThreeMonths, + + /** + * Posts sorted by the top six months. + */ + @SerializedName("TopSixMonths") + TopSixMonths, + + /** + * Posts sorted by the top nine months. + */ + @SerializedName("TopNineMonths") + TopNineMonths, } +// When updating this enum, don't forget to update MAP_SORT_TYPE_SHORT_FORM and MAP_SORT_TYPE_LONG_FORM /** * Different comment sort types used in lemmy. diff --git a/app/src/main/java/com/jerboa/ui/components/common/Dialogs.kt b/app/src/main/java/com/jerboa/ui/components/common/Dialogs.kt index 54bdbc4c3..447e6ae48 100644 --- a/app/src/main/java/com/jerboa/ui/components/common/Dialogs.kt +++ b/app/src/main/java/com/jerboa/ui/components/common/Dialogs.kt @@ -31,6 +31,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.semantics @@ -44,6 +45,7 @@ import com.jerboa.datatypes.types.CommentSortType import com.jerboa.datatypes.types.ListingType import com.jerboa.datatypes.types.SortType import com.jerboa.db.AppSettingsViewModel +import com.jerboa.getLocalizedSortingTypeLongName val DONATION_MARKDOWN = """ ### Support Jerboa @@ -57,13 +59,7 @@ val DONATION_MARKDOWN = """ """.trimIndent() -val topSortTypes = listOf( - SortType.TopDay, - SortType.TopWeek, - SortType.TopMonth, - SortType.TopYear, - SortType.TopAll, -) +val topSortTypes = SortType.values().filter { it.name.startsWith("Top") } @Composable fun SortTopOptionsDialog( @@ -71,35 +67,18 @@ fun SortTopOptionsDialog( onClickSortType: (SortType) -> Unit, selectedSortType: SortType, ) { + val ctx = LocalContext.current AlertDialog( onDismissRequest = onDismissRequest, text = { Column { - IconAndTextDrawerItem( - text = stringResource(R.string.dialogs_top_day), - onClick = { onClickSortType(SortType.TopDay) }, - highlight = (selectedSortType == SortType.TopDay), - ) - IconAndTextDrawerItem( - text = stringResource(R.string.dialogs_top_week), - onClick = { onClickSortType(SortType.TopWeek) }, - highlight = (selectedSortType == SortType.TopWeek), - ) - IconAndTextDrawerItem( - text = stringResource(R.string.dialogs_top_month), - onClick = { onClickSortType(SortType.TopMonth) }, - highlight = (selectedSortType == SortType.TopMonth), - ) - IconAndTextDrawerItem( - text = stringResource(R.string.dialogs_top_year), - onClick = { onClickSortType(SortType.TopYear) }, - highlight = (selectedSortType == SortType.TopYear), - ) - IconAndTextDrawerItem( - text = stringResource(R.string.dialogs_top_all_time), - onClick = { onClickSortType(SortType.TopAll) }, - highlight = (selectedSortType == SortType.TopAll), - ) + topSortTypes.forEach { + IconAndTextDrawerItem( + text = getLocalizedSortingTypeLongName(ctx, it), + onClick = { onClickSortType(it) }, + highlight = (selectedSortType == it), + ) + } } }, confirmButton = {}, diff --git a/app/src/main/java/com/jerboa/ui/components/community/Community.kt b/app/src/main/java/com/jerboa/ui/components/community/Community.kt index d8fe37d5c..78350535d 100644 --- a/app/src/main/java/com/jerboa/ui/components/community/Community.kt +++ b/app/src/main/java/com/jerboa/ui/components/community/Community.kt @@ -17,7 +17,7 @@ import com.jerboa.datatypes.sampleCommunityView import com.jerboa.datatypes.types.CommunityView import com.jerboa.datatypes.types.SortType import com.jerboa.datatypes.types.SubscribedType -import com.jerboa.getLocalizedSortingTypeName +import com.jerboa.getLocalizedSortingTypeShortName import com.jerboa.ui.components.common.DefaultBackButton import com.jerboa.ui.components.common.IconAndTextDrawerItem import com.jerboa.ui.components.common.LargerCircularIcon @@ -219,7 +219,7 @@ fun CommunityHeaderTitle( style = MaterialTheme.typography.titleLarge, ) Text( - text = getLocalizedSortingTypeName(ctx, selectedSortType), + text = getLocalizedSortingTypeShortName(ctx, selectedSortType), style = MaterialTheme.typography.titleMedium, ) } diff --git a/app/src/main/java/com/jerboa/ui/components/home/Home.kt b/app/src/main/java/com/jerboa/ui/components/home/Home.kt index 6f9d8636f..acc953f4c 100644 --- a/app/src/main/java/com/jerboa/ui/components/home/Home.kt +++ b/app/src/main/java/com/jerboa/ui/components/home/Home.kt @@ -79,7 +79,7 @@ import com.jerboa.datatypes.types.Tagline import com.jerboa.db.Account import com.jerboa.db.AccountViewModel import com.jerboa.getLocalizedListingTypeName -import com.jerboa.getLocalizedSortingTypeName +import com.jerboa.getLocalizedSortingTypeShortName import com.jerboa.ui.components.common.IconAndTextDrawerItem import com.jerboa.ui.components.common.LargerCircularIcon import com.jerboa.ui.components.common.ListingTypeOptionsDialog @@ -465,7 +465,7 @@ fun HomeHeaderTitle( style = MaterialTheme.typography.titleLarge, ) Text( - text = getLocalizedSortingTypeName(ctx, selectedSortType), + text = getLocalizedSortingTypeShortName(ctx, selectedSortType), style = MaterialTheme.typography.titleSmall, ) } diff --git a/app/src/main/java/com/jerboa/ui/components/person/PersonProfile.kt b/app/src/main/java/com/jerboa/ui/components/person/PersonProfile.kt index e73b25781..18e0ba812 100644 --- a/app/src/main/java/com/jerboa/ui/components/person/PersonProfile.kt +++ b/app/src/main/java/com/jerboa/ui/components/person/PersonProfile.kt @@ -34,7 +34,7 @@ import com.jerboa.R import com.jerboa.datatypes.samplePersonView import com.jerboa.datatypes.types.PersonView import com.jerboa.datatypes.types.SortType -import com.jerboa.getLocalizedSortingTypeName +import com.jerboa.getLocalizedSortingTypeShortName import com.jerboa.personNameShown import com.jerboa.ui.components.common.DefaultBackButton import com.jerboa.ui.components.common.DotSpacer @@ -250,7 +250,7 @@ fun PersonProfileHeaderTitle( style = MaterialTheme.typography.titleLarge, ) Text( - text = getLocalizedSortingTypeName(LocalContext.current, selectedSortType), + text = getLocalizedSortingTypeShortName(LocalContext.current, selectedSortType), style = MaterialTheme.typography.titleMedium, ) } diff --git a/app/src/main/java/com/jerboa/ui/components/settings/account/AccountSettings.kt b/app/src/main/java/com/jerboa/ui/components/settings/account/AccountSettings.kt index 7da8ce69c..7cd39359c 100644 --- a/app/src/main/java/com/jerboa/ui/components/settings/account/AccountSettings.kt +++ b/app/src/main/java/com/jerboa/ui/components/settings/account/AccountSettings.kt @@ -20,6 +20,7 @@ import com.alorma.compose.settings.storage.base.rememberBooleanSettingState import com.alorma.compose.settings.storage.base.rememberIntSettingState import com.alorma.compose.settings.ui.SettingsCheckbox import com.alorma.compose.settings.ui.SettingsListDropdown +import com.jerboa.MAP_SORT_TYPE_SHORT_FORM import com.jerboa.R import com.jerboa.api.ApiState import com.jerboa.api.uploadPictrsImage @@ -122,6 +123,9 @@ fun SettingsForm( rememberBooleanSettingState(luv?.local_user?.show_new_post_notifs ?: false) val sendNotificationsToEmail = rememberBooleanSettingState(luv?.local_user?.send_notifications_to_email ?: false) + val sortTypeNames = remember { + MAP_SORT_TYPE_SHORT_FORM.values.map { ctx.getString(it) } + } val form = SaveUserSettings( display_name = displayName, bio = bio.text, @@ -236,19 +240,7 @@ fun SettingsForm( SettingsListDropdown( state = defaultSortType, title = { Text(text = stringResource(R.string.account_settings_default_sort_type)) }, - items = listOf( - stringResource(R.string.account_settings_active), - stringResource(R.string.account_settings_hot), - stringResource(R.string.account_settings_new), - stringResource(R.string.account_settings_old), - stringResource(R.string.account_settings_topday), - stringResource(R.string.account_settings_topweek), - stringResource(R.string.account_settings_topmonth), - stringResource(R.string.account_settings_topyear), - stringResource(R.string.account_settings_topall), - stringResource(R.string.account_settings_mostcomments), - stringResource(R.string.account_settings_newcomments), - ), + items = sortTypeNames, ) SettingsCheckbox( diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ae75be586..2090bcc3f 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -58,7 +58,6 @@ Upload billede %1$s %2$s siden Søg... - Tilbage %1$s brugere / måned Blev medlem af Bliv medlem af @@ -83,7 +82,6 @@ Opdater Indlægvisningstilstand Sideinfo - Tilbage Indbakke Adgangskode Instans @@ -94,17 +92,14 @@ Blev medlem af %1$s indlæg %1$s kommentarer - Tilbage Bloker bruger Rapportér bruger Modererer Opret indlæg - Luk Kopier foreslået titel: %1$s Fællesskab En titel her.... Rediger indlæg - Luk Hovedtekst Kommentarer %1$s kommentarer @@ -150,17 +145,6 @@ Lokale Abonneret Foretrukket Listevisningstype - Aktive - Populære - Nye - Gamle - Populære i dag - Populære denne uge - Populære denne måned - Populære i år - Populære gennem tiderne - Flest kommentarer - Nye kommentarer Foretrukken sorteringsmetode Vis eksplicit indhold (NSFW) Vis profilbilleder @@ -191,9 +175,7 @@ Udseende og fornemmelse %1$s indstillinger Om - %1$s Blokeret Permanent link kopieret - %1$s Blokeret Log ind først Forkert login %1$s er ikke en Lemmy-instans @@ -219,7 +201,6 @@ Fjern bogmærke Svar på denne kommentar Vis flere muligheder - Forhåndsvisning af uploadet billede Gem redigeret kommentar Send svar Sorter efter diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 235873765..925fb80f8 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -83,7 +83,6 @@ Aktualisieren Beitrags-Ansichts-Modus Seiten-Info - Zurück Posteingang Passwort Instanz @@ -94,17 +93,14 @@ Beigetreten %1$s Beiträge %1$s Kommentare - Zurück Person blockieren Person melden Moderiert Beitrag erstellen - Schließen vorgeschlagenen Titel kopieren: %1$s Community ein Titel hier… Beitrag bearbeiten - Schließen Inhalt Kommentare %1$s Kommentare @@ -150,17 +146,6 @@ Lokal Abonnements Standard-Auflistungstyp - Aktiv - Heiß - Neu - Alt - Top des Tages - Top der Woche - Top des Monats - Top des Jahres - Top über alles - Meiste Kommentare - Neue Kommentare Standardsortierung Zeige NSFW Zeige Avatare @@ -191,9 +176,7 @@ Erscheinungsbild %1$s Einstellungen Über - %1$s blockiert Permalink kopiert - %1$s blockiert Zuerst einloggen Falscher Login %1$s ist keine Lemmy Instanz @@ -208,7 +191,6 @@ Permalink kopiert Blockiere %1$s Kopiere Permalink - Zurück Zeige mehr Optionen Zeige weniger Optionen Gehe zur Startseite @@ -220,7 +202,6 @@ Aus Lesezeichen entfernen Auf dieses Kommentar antworten Zeige mehr Optionen - Vorschaubild hochgeladen Kommentarbearbeitung speichern Antwort senden Sortieren nach diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index fc97d7e14..4a072fedb 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -63,7 +63,6 @@ Subir Imagen %1$s hace %2$s Buscar... - Atrás %1$s usuarios / mes Unidos Suscribir @@ -89,7 +88,6 @@ Refrescar Modo de Vista de Publicación Información del Sitio - Atrás Bandeja de entrada Contraseña Instancia @@ -100,17 +98,14 @@ Unido %1$s publicaciones %1$s comentarios - Atrás Bloquear Persona Reportar Persona Modera Crear Publicación - Cerrar copiar título sugerido: %1$s Comunidad un título aquí.... Editar Publicación - Cerrar Cuerpo Comentarios %1$s comentarios @@ -165,17 +160,6 @@ Locales Suscritos Tipo de listado por defecto - Activos - Populares - Nuevos - Antiguos - Mejores del día - Mejores de la semana - Mejores del mes - Mejores del año - Mejores de todo el tiempo - Más Comentados - Con nuevos comentarios Tipo de ordenado por defecto Mostrar NSFW Mostrar Avatares @@ -209,9 +193,7 @@ Tema y aspecto ajustes de %1$s Acerca de - %1$s Bloqueados Enlace Permanente Copiado - %1$s Bloqueados Inicia sesión primero Nombre de usuario y/o contraseña incorrecta %1$s no es una Instancia de Lemmy @@ -241,7 +223,6 @@ Responder a este comentario No se pudo crear el reporte: %1$s Mostrar más opciones - Prevista de la imagen subida Guardar ediciones del comentario Enviar respuesta Ordenar por diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 89fb33f1d..632cc2fa1 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -79,7 +79,6 @@ Rafraîchir Mode d’affichage des publications Informations sur l’instance - Précédent Boîte de réception Mot de passe Instance @@ -90,17 +89,14 @@ Profil créé %1$s publication(s) %1$s commentaires - Précédent Bloquer l’utilisateur Signaler l’utilisateur Modérateur Créer une publication - Fermer Copier titre suggéré : %1$s Communauté Un titre… Modifier la publication - Fermer Corps de la publication Commentaires %1$s commentaires @@ -146,16 +142,6 @@ Communautés locales Communautés abonnées Type de liste par défaut - Actif - Tendances - Nouveaux - Top journalier - Top hebdomadaire - Top mensuel - Top annuel - Top de tous les temps - Plus commenté - Nouveaux commentaires Tri par défaut Afficher les publications NSFW Afficher les avatars @@ -186,9 +172,7 @@ Apparence Paramètres de %1$s À propos - %1$s bloquée Permalien copié - %1$s bloquée Veuillez vous connecter Nom d’utilisateur ou mot de passe incorrect %1$s n’est pas une instance Lemmy @@ -222,8 +206,6 @@ Aller à %1$s Aller à %1$s Aller à %1$s - Anciens - Précédent Afficher plus d’options Afficher moins d’options Accueil @@ -235,7 +217,6 @@ Supprimer des favoris Répondre à ce commentaire Plus d’options - Aperçu de l’image téléversée Enregistrer les modifications Envoyer la réponse Trier par diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 8b15c371d..4f6bb24e5 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -7,7 +7,6 @@ %1$s utenti / mese %1$s utenti / settimana Social - Attivi Impostazioni profilo Tutti Avatar @@ -18,13 +17,8 @@ Ordinamento predefinito Nome visualizzato Email - Popolari Locali Utente Matrix - Più commentati - Nuovi - Nuovi commenti - Vecchi Rimuovi l\'avatar attuale Salva impostazioni Invia notifiche via email @@ -35,11 +29,6 @@ Mostra post già letti Mostra punteggi Iscrizioni - Top di sempre - Top del giorno - Top del mese - Top della settimana - Top dell\'anno Aggiungi ai segnalibri · Vai ai miei segnalibri @@ -96,12 +85,10 @@ Scarta commento Indietro Blocca comunità - %1$s Bloccati Info comunità Icona della comunità Partecipante %1$s utenti / mese - Indietro Cerca… In attesa Aggiorna @@ -110,7 +97,6 @@ %1$s utenti / mese Seleziona comunità dalla lista un titolo… - Chiudi Comunità copia titolo suggerito: %1$s Crea post @@ -154,7 +140,6 @@ Iscrizioni Iscrizioni Usa %1$s/%2$s - Indietro Seleziona filtro per la posta in arrivo Posta in arrivo Segna tutti come già letti @@ -215,14 +200,11 @@ Commenti Modera Post - Indietro Blocca utente %1$s commenti Profilo creato %1$s post Segnala utente - %1$s Bloccati - Anteprima dell\'immagine caricata Carica immagine Eliminato Presente in comunità @@ -232,7 +214,6 @@ Rispondi al post Commenti Contenuto - Chiudi Modifica post Blocca %1$s %1$s commenti diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index aa1ac5780..883b69eae 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -58,7 +58,6 @@ 画像をアップロード %1$s %2$s 前 検索... - 戻る 1ヶ月のユーザー%1$s名 参加済み 登録 @@ -84,7 +83,6 @@ 再読み込み 投稿表示モード サイト情報 - 戻る 受信トレイ パスワード サーバー @@ -95,17 +93,14 @@ 参加 投稿%1$s件 コメント%1$s件 - 戻る ユーザーをブロック ユーザーを報告 管理担当 投稿を作成 - 閉じる お勧めタイトルをコピー: %1$s コミュニティ タイトルを入力.... 投稿を編集 - 閉じる 本文 コメント コメント%1$s件 @@ -151,17 +146,6 @@ ローカル 登録済み 表示タイプの既定 - 活発 - 人気 - 新しい - 古い - 日トップ - 週トップ - 月トップ - 年トップ - 全トップ - コメント多 - コメント新 表示順の既定 NSFW(閲覧注意)を表示 アバターを表示 @@ -193,9 +177,7 @@ 外見設定 %1$s 設定 アプリについて - %1$sをブロックしました 元リンクがコピーされました - %1$sをブロックしました 先にログインしてください ログインが誤っています %1$sはLemmyサーバーではありません @@ -222,7 +204,6 @@ ブックマークから外す このコメントに返信する 追加オプションを表示 - 画像プレビューをアップロードしました コメント編集を保存 返信を送る 並び替え diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 958971aee..f0abe96d1 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -7,7 +7,6 @@ %1$s 사용자 / 월 %1$s 사용자 / 주 소셜 - 활발 계정 설정 전체 아바타 @@ -18,13 +17,8 @@ 기본 정렬 기준 표시 이름 이메일 - 인기 로컬 Matrix 사용자 - 최다 댓글 - 신규 - 신규 댓글 - 오래됨 현재 아바타 삭제 설정 저장 알림을 이메일로 보내기 @@ -35,11 +29,6 @@ 읽은 게시물 표시 점수 표시 구독 - 전체 최고 - 일 최고 - 월 최고 - 주 최고 - 연 최고 북마크에 추가 · 내 북마크로 가기 @@ -102,12 +91,10 @@ 댓글 저장 삭제 뒤로 커뮤니티 차단 - %1$s 차단됨 커뮤니티 정보 커뮤니티 아이콘 가입함 %1$s 사용자 / 월 - 뒤로 검색… 보류 중 새로고침 @@ -116,7 +103,6 @@ %1$s 사용자 / 월 목록에서 커뮤니티 선택 여기에 제목.... - 닫기 커뮤니티 추천 제목 복사: %1$s 게시물 작성 @@ -165,7 +151,6 @@ 구독함 구독 %1$s/%2$s로 전환 - 뒤로 받은 편지함 필터 선택 받은 편지함 모두 읽음 처리 @@ -240,14 +225,11 @@ 댓글 운영 게시물 - 뒤로 사용자 차단 %1$s 개의 댓글 가입함 %1$s 개의 게시물 사용자 신고 - %1$s 차단됨 - 업로드된 이미지 미리보기 이미지 업로드 삭제됨 커뮤니티에서 인기 @@ -257,7 +239,6 @@ 게시물에 답장하기 댓글 본문 - 닫기 게시물 수정 %1$s 차단 %1$s 개의 댓글 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index cf93ddd49..0a44b9d9d 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -74,10 +74,8 @@ Markeer als gelezen Annuleren OK - Voorbeeld van geüploade afbeelding Afbeelding uploaden %1$s %2$s geleden - Terug Zoeken… %1$s gebruikers / maand Community icoon @@ -111,7 +109,6 @@ Vernieuwen Berichtweergavemodus Site info - Terug Filter Postvak Wachtwoord @@ -124,18 +121,15 @@ Lid geworden %1$s berichten %1$s reacties - Terug Persoon blokkeren Persoon rapporteren Moderators Bericht maken - Sluiten suggereerde titel kopiëren: %1$s Community Selecteer community van de lijst een titel hier.... Bericht bewerken - Sluiten Inhoud Verwijderd Uitgelicht in de community @@ -190,17 +184,6 @@ Lokaal Geabonneerd Standaard weergavetype - Actief - Populair - Nieuw - Oud - Top van de dag - Top van de week - Top van de maand - Top van het jaar - Top Alles - Meeste reacties - Nieuwste reacties Standaard sorteertype NSFW tonen Avatars tonen @@ -233,9 +216,7 @@ Uiterlijk %1$s instellingen Over - %1$s geblokkeerd Permalink gekopieerd - %1$s geblokkeerd Terug Eerst inloggen Onjuiste inloggegevens diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 06066ead7..cd492b506 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -58,7 +58,6 @@ Wstaw Obraz %1$s %2$s temu Wyszukaj... - Cofnij %1$s użytkowników / miesiąc Dołączono Subskrybuj @@ -84,7 +83,6 @@ Odśwież Tryb Wyświetlania Postów Informacje Strony - Cofnij Skrzynka Odbiorcza Hasło Instancja @@ -95,17 +93,14 @@ Dołączono %1$s postów %1$s komentarzy - Cofnij Zablokuj Osobę Zgłoś Osobę Moderuje Stwórz post - Zamknij skopiuj sugerowany tytuł: %1$s Społeczność tytuł tutaj.... Edytuj Post - Zamknij Treść Komentarze %1$s komentarzy @@ -151,17 +146,6 @@ Lokalne Zasubskrybowane Standardowy Typ Wyświetlania - Aktywne - Na Czasie - Nowe - Stare - TopDnia - TopTygodnia - TopMiesiąca - TopRoku - TopWszechczasów - NajwięcejKomentarzy - NoweKomentarze Standardowy Typ Sortowania Pokazuj NSFW Pokazuj Awatary @@ -193,9 +177,7 @@ Wygląd i preferencje Ustawienia %1$s Informacje - %1$s Zablokowany Permalink Skopiowany - %1$s Zablokowany Najpierw się zaloguj Nieprawidłowa Nazwa %1$s nie jest instancją Lemmy @@ -222,7 +204,6 @@ Usuń z zakładek Odpowiedz na ten komentarz Pokaż więcej opcji - Wstaw obraz zajawki Zapisz edytowany komentarz Wyślij odpowiedź Sortuj po diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index bf6bc15b6..20fe45062 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -79,7 +79,6 @@ Recarregar Aparência das Publicações Sobre o Site - Voltar Caixa de Entrada Senha Instância @@ -90,17 +89,14 @@ Chegou %1$s publicações %1$s comentários - Voltar Bloquear Pessoa Denunciar Pessoa Moderando Fazer uma publicação - Fechar copiar título sugerido: %1$s Comunidade um título aqui.... Editar Publicação - Fechar Conteúdo Comentários %1$s comentários @@ -146,16 +142,6 @@ Local Participando Tipo de Listagem Padrão - Ativo - EmAlta - Novo - Melhor do Dia - Melhor da Semana - Melhor do Mês - Melhor do Ano - Melhor de Sempre - Mais Comentários - Novos Comentários Ordenação Padrão Mostrar conteúdo NSFW Mostrar avatares @@ -186,9 +172,7 @@ Aparência e comportamento Configurações de %1$s Sobre - Bloqueou %1$s Link do Comentário Copiado - Bloqueou %1$s Entre com uma conta antes Login Incorreto %1$s não é uma Instância Lemmy diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 02996d893..ecd7e0703 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -24,12 +24,10 @@ Отменить сохранение комментария Назад Заблокировать сообщество - %1$s Заблокирован Информация о сообществе Иконка сообщества Вы присоединились %1$s пользователей / месяц - Назад Поиск... Запрошено Обновить @@ -38,7 +36,6 @@ %1$s пользователей / месяц Выберите сообщество из списка заголовок тут... - Закрыть Сообщество скопировать предложенный заголовок: %1$s Создать пост @@ -84,7 +81,6 @@ Подписки Подписки Переключиться на %1$s/%2$s - Назад Фильтр Сообщения Пометить все как прочитанные @@ -155,14 +151,11 @@ Комментарии Модерирует Посты - Назад Заблокировать пользователя %1$s комментариев Зарегистрировался %1$s постов Пожаловаться на пользователя - %1$s Заблокирован - Загружено изображение-предпросмотр Загрузить изображение Удалено Выделено в сообществе @@ -172,7 +165,6 @@ Ответить на пост Комментарии Тело - Закрыть Отредактировать пост Заблокировать %1$s %1$s комментариев @@ -239,7 +231,6 @@ %1$s пользователей / месяц %1$s пользователей / неделя Социальные сети - Активное Настройки аккаунта Все посты Фотография профиля @@ -250,13 +241,8 @@ Сортировка по умолчанию Отображаемое имя Email - Горячее Локальные Имя пользователя Matrix - Самое комментируемое - Новое - Недавно прокомментированное - Старое Удалить текущее изображение профиля Сохранить настройки Отправлять уведомления на электронную почту @@ -267,11 +253,6 @@ Показывать прочтенные посты Показывать рейтинги Подписки - Лучшее за все время - Лучшее за день - Лучшее за месяц - Лучшее за неделю - Лучшее за год Добавить в закладки . Перейти в закладки diff --git a/app/src/main/res/values-se/strings.xml b/app/src/main/res/values-se/strings.xml index 4c2cdf004..95a4eff4e 100644 --- a/app/src/main/res/values-se/strings.xml +++ b/app/src/main/res/values-se/strings.xml @@ -58,7 +58,6 @@ Ladda upp bild %1$s %2$s sedan Sök... - Tillbaka %1$s användare / månad Gick med i Gå med i @@ -83,7 +82,6 @@ Uppdatera Visningsläge för inlägg Sidinfo - Tillbaka Inkorg Lösenord Instans @@ -94,17 +92,14 @@ Gick med i %1$s inlägg %1$s kommentarer - Tillbaka Blockera Användare Rapportera Användare Modererar Skapa Inlägg - Stäng kopiera föreslagen titel: %1$s Gemenskap en titel här.... Redigera Inlägg - Stäng Huvuddel Kommentarer %1$s kommentarer @@ -150,17 +145,6 @@ Lokala Prenumererade Föredragen Uppställning - Aktiva - Heta - Nya - Gamla - PoppisIdag - PoppisiVeckan - PoppisdennaMånad - PoppisiÅr - PoppisgenomTiderna - MestKommenterade - NyaKommentarer Föredragen Sortering Enligt Visa Explicit Innehåll (NSFW) Visa Profilbilder @@ -191,9 +175,7 @@ Stil och känsla %1$s inställningar Om - %1$s Blockerad Permalänk Kopierad - %1$s Blockerad Logga in först Felaktiga Inloggningsuppgifter %1$s är inte en Lemmy-instans @@ -219,7 +201,6 @@ Ta bort bokmärke Svara på denna kommentar Visa fler alternativ - Förhandsgranskning av uppladdad bild Spara redigerad kommentar Skicka svar Sortera efter diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9e3936a5b..a3dfaf408 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,7 +7,6 @@ %1$s users / month %1$s users / week Social - Active Account Settings All Avatar @@ -18,13 +17,8 @@ Default Sort Type Display Name Email - Hot Local Matrix User - MostComments - New - NewComments - Old Remove Current Avatar Save Settings Send Notifications to Email @@ -35,11 +29,6 @@ Show Read Posts Show Scores Subscribed - TopAll - TopDay - TopMonth - TopWeek - TopYear Add to bookmarks · Jerboa @@ -103,12 +92,10 @@ Unsave comment Back Block Community - %1$s Blocked Community Info Community icon Joined %1$s users / month - Back Search... Pending Refresh @@ -117,7 +104,6 @@ %1$s users / month Select community from list a title here.... - Close Community copy suggested title: %1$s Create post @@ -166,7 +152,6 @@ Subscribed Subscriptions Switch to %1$s/%2$s - Back Filter Inbox Mark all as read @@ -241,14 +226,11 @@ Comments Moderates Posts - Back Block Person %1$s comments Joined %1$s posts Report Person - %1$s Blocked - Uploaded image preview Upload Image Deleted Featured in community @@ -258,7 +240,6 @@ Reply to post Comments Body - Close Edit Post Block %1$s %1$s comments @@ -335,6 +316,18 @@ Close Language Blur NSFW images + TopHour + TopSixHour + TopTwelveHour + TopThreeMonths + TopSixMonths + TopNineMonths + Top Hour + Top Six Hour + Top Twelve hour + Top Three Months + Top Six Months + Top Nine Months View Source View Original diff --git a/benchmarks/src/main/java/com/jerboa/benchmarks/ScrollCommentsBenchmarks.kt b/benchmarks/src/main/java/com/jerboa/benchmarks/ScrollCommentsBenchmarks.kt index 99755ed30..961d21eb2 100644 --- a/benchmarks/src/main/java/com/jerboa/benchmarks/ScrollCommentsBenchmarks.kt +++ b/benchmarks/src/main/java/com/jerboa/benchmarks/ScrollCommentsBenchmarks.kt @@ -26,8 +26,7 @@ class ScrollCommentsBenchmarks { val rule = MacrobenchmarkRule() @Test - fun scrollCommentsCompilationNone() = - benchmark(CompilationMode.None()) + fun scrollCommentsCompilationNone() = benchmark(CompilationMode.None()) @Test fun scrollCommentsCompilationBaselineProfiles() =