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.

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

Deduplicate "Sort By" strings into a single "Global.Sort By" string #6495

Merged
merged 1 commit into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/renderer/components/CommentSection/CommentSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<FtSelect
v-if="commentData.length > 0 && !isLoading && showComments && showSortBy"
class="commentSort"
:placeholder="$t('Comments.Sort by')"
:placeholder="$t('Global.Sort By')"
:value="currentSortValue"
:select-names="sortNames"
:select-values="sortValues"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<FtFlexBox class="radioFlexBox">
<FtRadioButton
v-model="sortByValue"
:title="$t('Search Filters.Sort By.Sort By')"
:title="$t('Global.Sort By')"
:labels="sortByLabels"
:values="SORT_BY_VALUES"
class="searchRadio"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
:value="sortBy"
:select-names="sortBySelectNames"
:select-values="sortBySelectValues"
:placeholder="$t('User Playlists.Sort By.Sort By')"
:placeholder="$t('Global.Sort By')"
:icon="getIconForSortPreference(sortBy)"
@change="sortBy = $event"
/>
Expand Down
8 changes: 4 additions & 4 deletions src/renderer/views/Channel/Channel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
:value="videoSortBy"
:select-names="videoLiveShortSelectNames"
:select-values="videoLiveShortSelectValues"
:placeholder="$t('Search Filters.Sort By.Sort By')"
:placeholder="$t('Global.Sort By')"
:icon="getIconForSortPreference(videoSortBy)"
@change="videoSortBy = $event"
/>
Expand All @@ -55,7 +55,7 @@
:value="shortSortBy"
:select-names="videoLiveShortSelectNames"
:select-values="videoLiveShortSelectValues"
:placeholder="$t('Search Filters.Sort By.Sort By')"
:placeholder="$t('Global.Sort By')"
:icon="getIconForSortPreference(shortSortBy)"
@change="shortSortBy = $event"
/>
Expand All @@ -65,7 +65,7 @@
:value="liveSortBy"
:select-names="videoLiveShortSelectNames"
:select-values="videoLiveShortSelectValues"
:placeholder="$t('Search Filters.Sort By.Sort By')"
:placeholder="$t('Global.Sort By')"
:icon="getIconForSortPreference(liveSortBy)"
@change="liveSortBy = $event"
/>
Expand All @@ -75,7 +75,7 @@
:value="playlistSortBy"
:select-names="playlistSelectNames"
:select-values="playlistSelectValues"
:placeholder="$t('Search Filters.Sort By.Sort By')"
:placeholder="$t('Global.Sort By')"
:icon="getIconForSortPreference(playlistSortBy)"
@change="playlistSortBy = $event"
/>
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/views/Playlist/Playlist.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
:value="sortOrder"
:select-names="sortBySelectNames"
:select-values="sortBySelectValues"
:placeholder="$t('Playlist.Sort By.Sort By')"
:placeholder="$t('Global.Sort By')"
:icon="getIconForSortPreference(sortOrder)"
@change="updateUserPlaylistSortOrder"
/>
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/views/UserPlaylists/UserPlaylists.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
:value="sortBy"
:select-names="sortBySelectNames"
:select-values="sortBySelectValues"
:placeholder="$t('User Playlists.Sort By.Sort By')"
:placeholder="$t('Global.Sort By')"
:icon="getIconForSortPreference(sortBy)"
@change="sortBy = $event"
/>
Expand Down
7 changes: 1 addition & 6 deletions static/locales/af.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ Global:
Shorts: 'Kortvideo’s'
Live: ''
Community: ''
Sort By: 'Sorteer volgens'
Counts:
Video Count: ''
Channel Count: ''
Expand All @@ -70,7 +71,6 @@ Search Listing:
Search Filters:
Search Filters: ''
Sort By:
Sort By: ''
Most Relevant: ''
Rating: ''
Upload Date: ''
Expand Down Expand Up @@ -187,8 +187,6 @@ User Playlists:
Are you sure you want to delete this playlist? This cannot be undone: ''

Sort By:
Sort By: ''

NameAscending: ''
NameDescending: ''

Expand Down Expand Up @@ -709,7 +707,6 @@ Channel:
Added channel to your subscriptions: 'Kanaal is tot u intekeninge toegevoeg'
Search Channel: 'Deursoek kanaal'
Your search results have returned 0 results: 'U soekaksie het 0 resultate gelewer'
Sort By: 'Sorteer volgens'
This channel does not exist: 'Hierdie kanaal bestaan nie'
This channel does not allow searching: 'Hierdie kanaal laat nie soektogte toe nie'
This channel is age-restricted and currently cannot be viewed in FreeTube.: 'Hierdie
Expand Down Expand Up @@ -908,7 +905,6 @@ Playlist:
View Full Playlist: 'Bekyk volledige afspeellys'
Last Updated On: 'Laas bygewerk op'
Sort By:
Sort By: 'Sorteer volgens'
DateAddedNewest: 'Laaste toegevoeg boaan'
DateAddedOldest: 'Eerste toegevoeg boaan'
AuthorAscending: 'Outeur (A-Z)'
Expand Down Expand Up @@ -972,7 +968,6 @@ Comments:
hierdie video nie'
Show Comments: 'Toon kommentare'
Hide Comments: 'Versteek kommentare'
Sort by: 'Sorteer volgens'
Top comments: 'Topkommentare'
Newest first: 'Nuutste eerste'
View {replyCount} replies: 'Sien {replyCount} antwoorde'
Expand Down
6 changes: 1 addition & 5 deletions static/locales/ar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Global:
Shorts: القصيرة
Live: بث مباشر
Community: المجتمع
Sort By: ترتيب حسب

# Search Bar
Counts:
Expand All @@ -52,7 +53,6 @@ Search / Go to URL: 'ابحث / اذهب إلى رابط'
Search Filters:
Search Filters: 'فلاتر البحث'
Sort By:
Sort By: 'ترتيب حسب'
Most Relevant: 'الأكثر صلة'
Rating: 'التقييم'
Upload Date: 'تاريخ الرفع'
Expand Down Expand Up @@ -145,7 +145,6 @@ User Playlists:
Cancel: إلغاء
Delete Playlist: حذف قائمة التشغيل
Sort By:
Sort By: ترتيب حسب
LatestCreatedFirst: تم إنشاؤها مؤخرًا
LatestUpdatedFirst: تم تحديثه مؤخرا
NameAscending: أ-ي
Expand Down Expand Up @@ -705,7 +704,6 @@ Channel:
Unsubscribe: 'إلغاء الاشتراك'
Search Channel: 'ابحث في القناة'
Your search results have returned 0 results: 'لم تُعد نتيجة بحثك أي نتائج'
Sort By: 'فرز بحسب'
Videos:
Videos: 'الفيديوهات'
This channel does not currently have any videos: 'لا تحتوي هذه القناة على أي فيديوهات
Expand Down Expand Up @@ -906,7 +904,6 @@ Playlist:
#& Views
Playlist: قائمة التشغيل
Sort By:
Sort By: ترتيب حسب
DateAddedNewest: آخر مضاف أولا
DateAddedOldest: الأقدم إضافتا أولا
AuthorAscending: الكاتب (A-Z)
Expand Down Expand Up @@ -959,7 +956,6 @@ Comments:
No more comments available: لا يتوفر المزيد من التعليقات
Newest first: الأحدث أولاً
Top comments: أهم التعليقات
Sort by: الترتيب حسب
Show More Replies: إظهار المزيد من الردود
Pinned by: تم التثبيت بواسطة
And others: و اخرين
Expand Down
3 changes: 1 addition & 2 deletions static/locales/az.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ Search Bar:
Search Filters:
Search Filters: 'Axtarış Filtrləri'
Sort By:
Sort By: 'Çeşidləmə'
Most Relevant: 'Ən Münasib'
Rating: 'Qiymətləndirmə'
Upload Date: 'Yükləmə Tarixi'
Expand Down Expand Up @@ -180,7 +179,6 @@ User Playlists:
Search for Videos: Videoları Axtar
Sort By:
EarliestUpdatedFirst: Ən Tez Yenilənib
Sort By: Çeşidlənmə
EarliestCreatedFirst: Ən Tez Yaradılıb
NameAscending: A-Z
NameDescending: Z-A
Expand Down Expand Up @@ -355,6 +353,7 @@ Global:
Length Requirement: Etiket ən azı {number} simvol uzunluğunda olmalıdır
Community: İcma
Shorts: Shorts
Sort By: 'Çeşidləmə'
Search Listing:
Label:
Closed Captions: Titrlər Bağlandı
Expand Down
6 changes: 1 addition & 5 deletions static/locales/be.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ Global:
Shorts: 'Кароткія відэа'
Live: 'Ужывую'
Community: 'Супольнасць'
Sort By: Сартаваць
Counts:
Video Count: '1 відэа | {count} відэа'
Channel Count: '1 канал | {count} каналы(аў)'
Expand All @@ -64,7 +65,6 @@ Search Bar:
Search Filters:
Search Filters: 'Фільтры пошуку'
Sort By:
Sort By: 'Сартаваць'
Most Relevant: 'Найбольш рэлевантныя'
Rating: 'Рэйтынг'
Upload Date: 'Дата запампоўкі'
Expand Down Expand Up @@ -239,7 +239,6 @@ User Playlists:
Are you sure you want to delete this playlist? This cannot be undone: Вы ўпэўнены,
што хочаце выдаліць плэй-ліст? Гэта нельга адмяніць.
Sort By:
Sort By: Сартаваць
EarliestPlayedFirst: Раней прайгравалі
NameDescending: Я-А
LatestCreatedFirst: Нядаўна створаны
Expand Down Expand Up @@ -733,7 +732,6 @@ Channel:
Added channel to your subscriptions: 'Канал дададзены да вашых падпісак'
Search Channel: 'Шукаць на канале'
Your search results have returned 0 results: 'Пошук даў 0 вынікаў'
Sort By: 'Сартаваць'
This channel does not exist: 'Гэты канал не існуе'
This channel does not allow searching: 'Гэты канал не дазваляе шукаць'
This channel is age-restricted and currently cannot be viewed in FreeTube.: 'Гэты
Expand Down Expand Up @@ -926,7 +924,6 @@ Playlist:
#& Views
Sort By:
AuthorAscending: Аўтар (А-Я)
Sort By: Сартаваць
Custom: Карыстальніцкі
AuthorDescending: Аўтар (Я-А)
DateAddedNewest: Новыя спачатку
Expand Down Expand Up @@ -986,7 +983,6 @@ Comments:
There are no more comments for this video: 'Да гэтага відэа больш няма каментарыяў'
Show Comments: 'Паказаць каментарыі'
Hide Comments: 'Схаваць каментарыі'
Sort by: 'Сартаваць'
Top comments: 'Папулярныя каментарыі'
Newest first: 'Спачатку новыя'
View {replyCount} replies: 'Праглядзець {replyCount} адказаў'
Expand Down
6 changes: 1 addition & 5 deletions static/locales/bg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Global:
Shorts: Кратки видеа
Live: На живо
Community: Общност
Sort By: Подреждане по

Counts:
Video Count: 1 видео | {count} видеа
Expand All @@ -59,7 +60,6 @@ Search / Go to URL: 'Търсене / Отиване на адрес'
Search Filters:
Search Filters: 'Филтри за търсене'
Sort By:
Sort By: 'Подреждане по'
Most Relevant: 'Най-уместно'
Rating: 'Оценка'
Upload Date: 'Дата на качване'
Expand Down Expand Up @@ -203,7 +203,6 @@ User Playlists:
LatestCreatedFirst: Наскоро създадени
EarliestCreatedFirst: Най-рано създадени
EarliestPlayedFirst: Най-рано възпроизведени
Sort By: Подреждане по
NameAscending: A-Z
NameDescending: Z-A
LatestUpdatedFirst: Наскоро обновени
Expand Down Expand Up @@ -771,7 +770,6 @@ Channel:
Added channel to your subscriptions: 'Каналът е добавен към вашите абонаменти'
Search Channel: 'Търсене в канала'
Your search results have returned 0 results: 'Търсенето върна 0 резултата'
Sort By: 'Подреждане по'
Videos:
Videos: 'видеа'
This channel does not currently have any videos: 'В този канал по настоящем няма
Expand Down Expand Up @@ -978,7 +976,6 @@ Playlist:
Sort By:
DateAddedNewest: Първо най-новите
DateAddedOldest: Първо най-старите
Sort By: Подреждане по
AuthorAscending: Автор (A-Z)
AuthorDescending: Автор (Z-A)
VideoTitleAscending: Заглавие (A-Z)
Expand Down Expand Up @@ -1034,7 +1031,6 @@ Comments:
No more comments available: Не са налични повече коментари
Newest first: Първо най-новите
Top comments: Последни коментари
Sort by: Подреждане по
Show More Replies: Показване на още отговори
Pinned by: Прихванато от
From {channelName}: от {channelName}
Expand Down
2 changes: 1 addition & 1 deletion static/locales/bn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ Search / Go to URL: 'অনুসন্ধান / ইউআরএলে যা
Search Filters:
Search Filters: 'অনুসন্ধান ছাঁকনি'
Sort By:
Sort By: 'সাজানোর পদ্ধতি'
Most Relevant: 'সবচেয়ে প্রাসঙ্গিক'
Rating: 'তারকা'
Upload Date: 'ছাপানোর তারিখ'
Expand Down Expand Up @@ -123,6 +122,7 @@ Global:
Videos: ভিডিও
Shorts: খাটো
Live: সরাসরি
Sort By: 'সাজানোর পদ্ধতি'
Counts:
Video Count: ১ ভিডিও |{সমষ্টি }ভিডিও
Subscriber Count: ১ সাবস্ক্রাইবার |{সমষ্টি }সাবস্ক্রাইবার
Expand Down
7 changes: 1 addition & 6 deletions static/locales/br.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Global:
Shorts: 'Videoioù berr (Shorts)'
Live: 'War-eeun'
Community: 'Kumuniezh'
Sort By: 'Rummañ dre'
Counts:
Video Count: '1 video | {count} video'
Channel Count: '1 chadenn | {count} chadenn'
Expand Down Expand Up @@ -81,7 +82,6 @@ Search Listing:
Search Filters:
Search Filters: 'Siloù evit Klask'
Sort By:
Sort By: 'Rummañ dre'
Most Relevant: 'Ar re wellañ'
Rating: 'Notenn'
Upload Date: 'Deiziad kargañ'
Expand Down Expand Up @@ -224,8 +224,6 @@ User Playlists:
e faot deoc''h dilemel ar roll-videoioù-mañ ? Ne vo ket moaien da nullañ war-lerc''h.'

Sort By:
Sort By: 'Rummañ dre'

NameAscending: 'A-Z'
NameDescending: 'Z-A'

Expand Down Expand Up @@ -802,7 +800,6 @@ Channel:
Added channel to your subscriptions: 'Chadenn ouzhpennet d''ho koumanantoù'
Search Channel: 'Klask e-barzh ar chadenn'
Your search results have returned 0 results: 'N''eus disoc''h ebet gant ho klask'
Sort By: 'Rummañ dre'
This channel does not exist: 'N''eus ket deus ar chadenn-mañ'
This channel does not allow searching: 'Ne vez ket aotreet klask gant ar chadenn-mañ'
This channel is age-restricted and currently cannot be viewed in FreeTube.: 'Ur
Expand Down Expand Up @@ -1003,7 +1000,6 @@ Playlist:
Views: ''
Last Updated On: 'Hizivadenn ziwezhañ'
Sort By:
Sort By: 'Rummañ dre'
DateAddedNewest: 'Ouzhpennet diwezhañ da gentañ'
DateAddedOldest: 'Ouzhpennet abretañ da gentañ'
AuthorAscending: 'Aozer (A-Z)'
Expand Down Expand Up @@ -1068,7 +1064,6 @@ Comments:
There are no more comments for this video: 'Evezhiadenn ouzhpenn ebet evit ar video-mañ'
Show Comments: 'Diskouez an evezhiadennoù'
Hide Comments: 'Kuzhat an evezhiadennoù'
Sort by: 'Rummañ dre'
Top comments: 'Evezhiadennoù gwellañ'
Newest first: 'Nevesañ da gentañ'
View {replyCount} replies: 'Diskouez {replyCount} respont'
Expand Down
4 changes: 3 additions & 1 deletion static/locales/bs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@ Download From Site: 'Instaliraj preko stranice'
A new blog is now available, {blogTitle}. Click to view more: 'Sada je dostupan novi
blog, {blogTitle}. Kliknite da vidite više'

Global:
Sort By: 'Poredaj po'

# Search Bar
Search / Go to URL: 'Pretražite / idite na URL'
# In Filter Button
Search Filters:
Search Filters: 'Pretraži filtere'
Sort By:
Sort By: 'Poredaj po'
Most Relevant: 'Naj relevantnije'
Rating: 'Ocjena'
Upload Date: 'Datum uploada'
Expand Down
Loading
Loading