Skip to content

Commit d8db655

Browse files
anurag2787anurag2787
committed
Merge branch 'development' of https://github.com/anurag2787/FreeTube into added-sort-in-history
2 parents d3e55b5 + 8182909 commit d8db655

File tree

16 files changed

+309
-352
lines changed

16 files changed

+309
-352
lines changed

‎eslint.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export default [
9292
'n/no-callback-literal': 'warn',
9393
'n/no-path-concat': 'warn',
9494
'unicorn/better-regex': 'error',
95-
'unicorn/no-array-push-push': 'error',
95+
'unicorn/prefer-single-call': 'error',
9696
'unicorn/prefer-keyboard-event-key': 'error',
9797
'unicorn/prefer-regexp-test': 'error',
9898
'unicorn/prefer-string-replace-all': 'error',

‎package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@
5959
"@fortawesome/free-solid-svg-icons": "^6.7.2",
6060
"@fortawesome/vue-fontawesome": "^2.0.10",
6161
"@seald-io/nedb": "^4.1.1",
62-
"autolinker": "^4.1.0",
62+
"autolinker": "^4.1.1",
6363
"bgutils-js": "^3.2.0",
6464
"electron-context-menu": "^4.0.5",
65-
"marked": "^15.0.8",
65+
"marked": "^15.0.11",
6666
"path-browserify": "^1.0.1",
6767
"portal-vue": "^2.1.7",
6868
"process": "^0.11.10",
69-
"shaka-player": "^4.14.8",
69+
"shaka-player": "^4.14.9",
7070
"swiper": "^11.2.6",
7171
"vue": "^2.7.16",
7272
"vue-i18n": "^8.28.2",
@@ -80,34 +80,34 @@
8080
"@babel/plugin-transform-class-properties": "^7.25.9",
8181
"@babel/preset-env": "^7.26.9",
8282
"@double-great/stylelint-a11y": "^3.0.4",
83-
"@eslint/js": "^9.25.0",
83+
"@eslint/js": "^9.25.1",
8484
"@intlify/eslint-plugin-vue-i18n": "^3.2.0",
8585
"babel-loader": "^10.0.0",
8686
"copy-webpack-plugin": "^13.0.0",
8787
"css-loader": "^7.1.2",
8888
"css-minimizer-webpack-plugin": "^7.0.2",
89-
"electron": "^35.2.0",
90-
"electron-builder": "^26.0.13",
91-
"eslint": "^9.25.0",
92-
"eslint-plugin-jsdoc": "^50.6.9",
89+
"electron": "^35.2.1",
90+
"electron-builder": "^26.0.14",
91+
"eslint": "^9.25.1",
92+
"eslint-plugin-jsdoc": "^50.6.11",
9393
"eslint-plugin-jsonc": "^2.20.0",
94-
"eslint-plugin-unicorn": "^58.0.0",
94+
"eslint-plugin-unicorn": "^59.0.0",
9595
"eslint-plugin-vue": "^10.0.0",
9696
"eslint-plugin-vuejs-accessibility": "^2.4.1",
97-
"eslint-plugin-yml": "^1.17.0",
97+
"eslint-plugin-yml": "^1.18.0",
9898
"globals": "^16.0.0",
9999
"html-webpack-plugin": "^5.6.3",
100100
"js-yaml": "^4.1.0",
101101
"json-minimizer-webpack-plugin": "^5.0.1",
102-
"lefthook": "^1.11.10",
102+
"lefthook": "^1.11.12",
103103
"mini-css-extract-plugin": "^2.9.2",
104104
"neostandard": "^0.12.1",
105105
"npm-run-all2": "^7.0.2",
106106
"postcss": "^8.5.3",
107107
"postcss-scss": "^4.0.9",
108-
"sass": "^1.86.3",
108+
"sass": "^1.87.0",
109109
"sass-loader": "^16.0.5",
110-
"stylelint": "^16.18.0",
110+
"stylelint": "^16.19.1",
111111
"stylelint-config-sass-guidelines": "^12.1.0",
112112
"stylelint-config-standard": "^38.0.0",
113113
"stylelint-high-performance-animation": "^1.11.0",
@@ -116,7 +116,7 @@
116116
"vue-devtools": "^5.1.4",
117117
"vue-eslint-parser": "^10.1.3",
118118
"vue-loader": "^15.10.0",
119-
"webpack": "^5.99.6",
119+
"webpack": "^5.99.7",
120120
"webpack-cli": "^6.0.1",
121121
"webpack-dev-server": "^5.2.1",
122122
"yaml-eslint-parser": "^1.3.0"

‎src/renderer/components/ft-tooltip/ft-tooltip.css renamed to ‎src/renderer/components/FtTooltip/FtTooltip.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,6 @@
9090
inline-size: 55vw;
9191
}
9292

93-
@media only screen and (width <= 1100px) {
94-
inline-size: 40vw;
95-
}
96-
9793
.tooltip {
9894
display: inline-block;
9995
position: relative;

‎src/renderer/components/FtTooltip/FtTooltip.vue

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<template>
2+
<div class="tooltip">
3+
<button
4+
:aria-labelledby="id"
5+
class="button"
6+
type="button"
7+
>
8+
<FontAwesomeIcon :icon="['fas', 'question-circle']" />
9+
</button>
10+
<p
11+
:id="id"
12+
class="text"
13+
:class="{
14+
[position]: true,
15+
allowNewlines,
16+
}"
17+
role="tooltip"
18+
>
19+
{{ tooltip }}
20+
</p>
21+
</div>
22+
</template>
23+
24+
<script setup>
25+
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
26+
import { useId } from '../../composables/use-id-polyfill'
27+
28+
defineProps({
29+
position: {
30+
type: String,
31+
default: 'bottom',
32+
validator: (value) => value === 'bottom' || value === 'left' || value === 'right' || value === 'top' || value === 'bottom-left'
33+
},
34+
tooltip: {
35+
type: String,
36+
required: true
37+
},
38+
allowNewlines: {
39+
type: Boolean,
40+
default: false,
41+
},
42+
})
43+
44+
const id = useId()
45+
</script>
46+
47+
<style scoped src="./FtTooltip.css" />

‎src/renderer/components/ft-input/ft-input.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { defineComponent } from 'vue'
22
import { mapActions } from 'vuex'
33

4-
import FtTooltip from '../ft-tooltip/ft-tooltip.vue'
4+
import FtTooltip from '../FtTooltip/FtTooltip.vue'
55
import { isKeyboardEventKeyPrintableChar, isNullOrEmpty } from '../../helpers/strings'
66

77
export default defineComponent({

‎src/renderer/components/ft-select/ft-select.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineComponent, nextTick } from 'vue'
2-
import FtTooltip from '../ft-tooltip/ft-tooltip.vue'
2+
import FtTooltip from '../FtTooltip/FtTooltip.vue'
33
import { sanitizeForHtmlId } from '../../helpers/accessibility'
44

55
export default defineComponent({

‎src/renderer/components/ft-toggle-switch/ft-toggle-switch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineComponent } from 'vue'
2-
import FtTooltip from '../ft-tooltip/ft-tooltip.vue'
2+
import FtTooltip from '../FtTooltip/FtTooltip.vue'
33

44
export default defineComponent({
55
name: 'FtToggleSwitch',

‎src/renderer/components/ft-tooltip/ft-tooltip.js

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/renderer/components/ft-tooltip/ft-tooltip.vue

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/renderer/components/player-settings/player-settings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import FtSlider from '../FtSlider/FtSlider.vue'
77
import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
88
import FtButton from '../FtButton/FtButton.vue'
99
import FtInput from '../ft-input/ft-input.vue'
10-
import FtTooltip from '../ft-tooltip/ft-tooltip.vue'
10+
import FtTooltip from '../FtTooltip/FtTooltip.vue'
1111
import { DefaultFolderKind, IpcChannels } from '../../../constants'
1212

1313
export default defineComponent({

‎src/renderer/views/UserPlaylists/UserPlaylists.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { defineComponent } from 'vue'
22
import { mapActions } from 'vuex'
33
import FtCard from '../../components/ft-card/ft-card.vue'
44
import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
5-
import FtTooltip from '../../components/ft-tooltip/ft-tooltip.vue'
65
import FtLoader from '../../components/ft-loader/ft-loader.vue'
76
import FtButton from '../../components/FtButton/FtButton.vue'
87
import FtSelect from '../../components/ft-select/ft-select.vue'
@@ -33,7 +32,6 @@ export default defineComponent({
3332
components: {
3433
'ft-card': FtCard,
3534
'ft-flex-box': FtFlexBox,
36-
'ft-tooltip': FtTooltip,
3735
'ft-loader': FtLoader,
3836
'ft-button': FtButton,
3937
'ft-select': FtSelect,

‎static/locales/es-MX.yaml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,51 @@ User Playlists:
147147
You have no playlists. Click on the create new playlist button to create a new one.: No
148148
tienes listas de reproducción. Haz clic en el botón de crear nueva lista de reproducción
149149
para crear una nueva.
150+
Playlists with Matching Videos: Listas de reproducción con videos coincidentes
151+
Remove from Favorites: Eliminar de {playlistName}
152+
Move Video Down: Mover video hacia abajo
153+
Enable Quick Bookmark With This Playlist: Habilitar marcador rápido con esta lista
154+
de reproducción
155+
Delete Playlist: Eliminar lista de reproducción
156+
Are you sure you want to delete this playlist? This cannot be undone: ¿Estás seguro
157+
de que deseas eliminar esta lista de reproducción? Esto no se puede deshacer.
158+
Sort By:
159+
LatestCreatedFirst: Recientemente creado
160+
EarliestCreatedFirst: Creado más temprano
161+
NameAscending: A-Z
162+
NameDescending: Z-A
163+
LatestUpdatedFirst: Recientemente actualizado
164+
EarliestUpdatedFirst: Actualizado más temprano
165+
EarliestPlayedFirst: Reproducido más temprano
166+
LatestPlayedFirst: Reproducido recientemente
167+
Export Playlist: Exportar esta lista de reproducción
168+
The playlist has been successfully exported: La lista de reproducción ha sido exportada
169+
con éxito
170+
This playlist currently has no videos.: Esta lista de reproducción no tiene videos
171+
actualmente.
172+
Cancel: Cancelar
173+
Save Changes: Guardar cambios
174+
Remove Watched Videos: Eliminar videos vistos
175+
Create New Playlist: Crear nueva lista de reproducción
176+
Add to Playlist: Agregar a la lista de reproducción
177+
Add to Favorites: Agregar a Mi Lista Favorita
178+
Playlist Description: Descripción de la lista de reproducción
179+
Edit Playlist Info: Editar información de la lista de reproducción
180+
Copy Playlist: Copiar lista de reproducción
181+
Cannot delete the quick bookmark target playlist.: No se puede eliminar la lista
182+
de reproducción objetivo del marcador rápido.
183+
Quick Bookmark Enabled: Marcador rápido habilitado
184+
Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: Estás
185+
seguro de que deseas eliminar 1 video duplicado de esta lista de reproducción?
186+
Esto no se puede deshacer.
187+
Move Video Up: Mover video hacia arriba
188+
TotalTimePlaylist: 'Tiempo total: {duration}'
189+
Remove from Playlist: Eliminar de la lista de reproducción
190+
Playlist Name: Nombre de la lista de reproducción
191+
Remove Duplicate Videos: Eliminar videos duplicados
192+
Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: ¿Estás
193+
seguro de que deseas eliminar 1 video visto de esta lista de reproducción? Esto
194+
no se puede deshacer.
150195
History:
151196
# On History Page
152197
History: 'Historial'

‎static/locales/he.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ Settings:
377377
Player Settings: 'נגן'
378378
Play Next Video: 'הפעלה אוטומטית של סרטונים מומלצים'
379379
Turn on Subtitles by Default: 'הפעלת כתוביות כברירת מחדל'
380-
Autoplay Videos: 'הפעל סרטונים באופן אוטומטי'
380+
Autoplay Videos: 'הפעלת סרטונים אוטומטית'
381381
Proxy Videos Through Invidious: 'שימוש במתווך (פרוקסי) לניגון סרטונים דרך Invidious'
382382
Autoplay Playlists: 'הפעלה אוטומטית של סרטוני פלייליסט'
383383
Enable Theatre Mode by Default: 'הפעלת מצב קולנוע כברירת מחדל'

‎static/locales/nb-NO.yaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,8 +1068,8 @@ Profile:
10681068
Close Profile Dropdown: Lukk profilrullgardinmenyen
10691069
Open Profile Dropdown: Åpne profilrullgardinmenyen
10701070
This video is unavailable because of missing formats. This can happen due to country unavailability.: Denne
1071-
videoen er utilgjengelig grunnet manglende formater. Dette kan skyldes tilgangbegrensninger
1072-
i ditt land.
1071+
videoen er utilgjengelig på grunn av manglende formater. Dette kan skyldes tilgangbegrensninger
1072+
i landet ditt.
10731073
Tooltips:
10741074
General Settings:
10751075
Invidious Instance: Invidious-forekomsten FreeTube kobler til for API-kall.
@@ -1089,10 +1089,10 @@ Tooltips:
10891089
omdirigeringer fra nettleseren eller via terminalprosesser, åpnes i et nytt
10901090
vindu.
10911091
Subscription Settings:
1092-
Fetch Feeds from RSS: Bruk RSS istedenfor FreeTube sin forvalgte metode for innhenting
1093-
av din abonnementsstrøm. RSS er raskere og forhindrer IP-blokkering, men mangler
1094-
noe informasjon som videovarighet og sanntidsstatus.
1095-
Fetch Automatically: Henter abonnementer når en ny video åpnes og ved bytting
1092+
Fetch Feeds from RSS: Bruk RSS istedenfor FreeTube sin standardmetode for innhenting
1093+
av abonnementsstrømmen din. RSS er raskere og forhindrer IP-blokkering, men
1094+
mangler noe informasjon som videovarighet, sanntidsstatus og samfunnsposter
1095+
Fetch Automatically: Hent abonnementer når et nytt vindu åpnes og ved bytting
10961096
av profil.
10971097
Player Settings:
10981098
Default Video Format: Velg formater som blir brukt når en video spilles. DASH-formater
@@ -1131,8 +1131,13 @@ Tooltips:
11311131
treff, og skiller mellom små og store bokstaver.
11321132
Hide Subscriptions Live: Innstillingen overstyres av «{appWideSetting}» for hele
11331133
programmet, i «{subsection}»-delen av «{settingsSection}»
1134+
Hide Videos and Playlists Containing Text: Tast inn et ord, en del av et ord eller
1135+
en frase (det skilles ikke mellom store og små bokstaver) for å gjemme alle
1136+
videoer og spillelister med det i seg, med unntak av i historikken din, og videoer
1137+
inne i spillelister.
11341138
SponsorBlock Settings:
11351139
UseDeArrowTitles: Erstatt videonavn med brukerinnsendte navn fra DeArrow.
1140+
UseDeArrowThumbnails: Erstatt miniatyrbilder på videoer med bilder fra DeArrow.
11361141
A new blog is now available, {blogTitle}. Click to view more: Et nytt blogginnlegg
11371142
er tilgjengelig, {blogTitle}. Klikk her for å se mer
11381143
The playlist has been reversed: Spillelisten har blitt snudd

‎static/locales/pt-BR.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Search Filters:
8585
Location: Localização
8686
HDR: HDR
8787
VR180: VR180
88-
Creative Commons: Creative Commons (Licença)
88+
Creative Commons: Creative Commons (licença)
8989
Features: Destaques
9090
3D: 3D
9191
Subscriptions:
@@ -1239,7 +1239,7 @@ Search character limit: Sua busca ultrapassou o limite de {searchCharacterLimit}
12391239
Search Listing:
12401240
Label:
12411241
Subtitles: Legendas
1242-
Closed Captions: Legendas ocultas (CC)
1242+
Closed Captions: Legendas (CC)
12431243
4K: 4K
12441244
8K: 8K
12451245
VR180: VR180

0 commit comments

Comments
 (0)