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

Captions #1204

Merged
merged 8 commits into from
Dec 2, 2024
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,12 @@ bundle-report.*.html
/webroot/*.hot-update.*
/webroot/vendors/async/*.hot-update.*
/webroot/css/admin-index*
/webroot/css/admin-statistics*
/webroot/css/app*
/webroot/css/category*
/webroot/css/date-range*
/webroot/css/date-input*
/webroot/css/edit-children-params*
/webroot/css/email-input*
/webroot/css/flash-message*
/webroot/css/folder-picker*
Expand All @@ -82,6 +84,7 @@ bundle-report.*.html
/webroot/css/menu*
/webroot/css/object-categories*
/webroot/css/object-nav*
/webroot/css/object-captions*
/webroot/css/object-property*
/webroot/css/objects-history*
/webroot/css/permission*
Expand Down
12 changes: 12 additions & 0 deletions config/app_local.example.php
Original file line number Diff line number Diff line change
Expand Up @@ -808,4 +808,16 @@
// 'Captions',
// ],
// ],

/**
* Configuration for "Captions".
* - formats.allowed: allowed formats for captions
* - formats.default: default format for captions
*/
// 'Captions' => [
// 'formats' => [
// 'allowed' => ['srt', 'sub', 'webvtt'],
// 'default' => 'webvtt',
// ],
// ],
];
31 changes: 29 additions & 2 deletions locales/default.pot
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: BEdita 4 \n"
"POT-Creation-Date: 2024-10-24 09:51:55 \n"
"POT-Creation-Date: 2024-11-22 13:38:50 \n"
"MIME-Version: 1.0 \n"
"Content-Transfer-Encoding: 8bit \n"
"Language-Team: BEdita I18N & I10N Team \n"
Expand Down Expand Up @@ -115,6 +115,9 @@ msgstr ""
msgid "Cannot produce a thumbnail for this file"
msgstr ""

msgid "Captions"
msgstr ""

msgid "Categories"
msgstr ""

Expand Down Expand Up @@ -1513,7 +1516,7 @@ msgstr ""
msgid "Related items order will be changed."
msgstr ""

msgid "Continue?"
msgid "OK"
msgstr ""

msgid "Hide"
Expand Down Expand Up @@ -1629,6 +1632,30 @@ msgstr ""
msgid "Search on categories"
msgstr ""

msgid "Caption"
msgstr ""

msgid "Format"
msgstr ""

msgid "New caption"
msgstr ""

msgid "New"
msgstr ""

msgid "No captions"
msgstr ""

msgid "Not valid"
msgstr ""

msgid "Parameters"
msgstr ""

msgid "Valid"
msgstr ""

msgid "Password"
msgstr ""

Expand Down
31 changes: 29 additions & 2 deletions locales/en_US/default.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: BEdita Manager \n"
"POT-Creation-Date: 2024-10-24 09:51:55 \n"
"POT-Creation-Date: 2024-11-22 13:38:50 \n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: BEdita I18N & I10N Team \n"
Expand Down Expand Up @@ -118,6 +118,9 @@ msgstr ""
msgid "Cannot produce a thumbnail for this file"
msgstr ""

msgid "Captions"
msgstr ""

msgid "Categories"
msgstr ""

Expand Down Expand Up @@ -1516,7 +1519,7 @@ msgstr ""
msgid "Related items order will be changed."
msgstr ""

msgid "Continue?"
msgid "OK"
msgstr ""

msgid "Hide"
Expand Down Expand Up @@ -1632,6 +1635,30 @@ msgstr ""
msgid "Search on categories"
msgstr ""

msgid "Caption"
msgstr ""

msgid "Format"
msgstr ""

msgid "New caption"
msgstr ""

msgid "New"
msgstr ""

msgid "No captions"
msgstr ""

msgid "Not valid"
msgstr ""

msgid "Parameters"
msgstr ""

msgid "Valid"
msgstr ""

msgid "Password"
msgstr ""

Expand Down
33 changes: 30 additions & 3 deletions locales/it_IT/default.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: BEdita Manager \n"
"POT-Creation-Date: 2024-10-24 09:51:55 \n"
"POT-Creation-Date: 2024-11-22 13:38:50 \n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: BEdita I18N & I10N Team \n"
Expand Down Expand Up @@ -120,6 +120,9 @@ msgstr "Impossibile creare oggetti astratti o oggetti senza schema"
msgid "Cannot produce a thumbnail for this file"
msgstr "Impossibile produrre una miniatura per questo file"

msgid "Captions"
msgstr "Sottotitoli"

msgid "Categories"
msgstr "Categorie"

Expand Down Expand Up @@ -1533,8 +1536,8 @@ msgstr "Ordina per"
msgid "Related items order will be changed."
msgstr "L'ordine degli elementi correlati verrà modificato."

msgid "Continue?"
msgstr "Vuoi continuare?"
msgid "OK"
msgstr ""

msgid "Hide"
msgstr "Nascondi"
Expand Down Expand Up @@ -1649,6 +1652,30 @@ msgstr "Errore nella cancellazione della proprietà"
msgid "Search on categories"
msgstr "Cerca tra le categorie"

msgid "Caption"
msgstr "Sottotitolo"

msgid "Format"
msgstr "Formato"

msgid "New caption"
msgstr "Nuovo sottotitolo"

msgid "New"
msgstr "Nuovo"

msgid "No captions"
msgstr "Nessun sottotitolo"

msgid "Not valid"
msgstr "Non valido"

msgid "Parameters"
msgstr "Parametri"

msgid "Valid"
msgstr "Valido"

msgid "Password"
msgstr "Password"

Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
"vue": "^2.5.16",
"vue-chartjs": "^5.3.1",
"vuejs-title": "^1.0.16",
"webpack-manifest-plugin": "^5.0.0"
"webpack-manifest-plugin": "^5.0.0",
"webvtt-parser": "^2.2.0"
},
"devDependencies": {
"@babel/core": "^7.20.12",
Expand All @@ -74,4 +75,4 @@
"webpack-cli": "^4.9.0",
"webpack-watch-files-plugin": "^1.2.0"
}
}
}
1 change: 1 addition & 0 deletions resources/js/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ const _vueInstance = new Vue({
UserAccesses:() => import(/* webpackChunkName: "user-accesses" */'app/components/user-accesses/user-accesses'),
LanguageSelector:() => import(/* webpackChunkName: "language-selector" */'app/components/language-selector/language-selector'),
ClipboardItem: () => import(/* webpackChunkName: "clipboard-item" */'app/components/clipboard-item/clipboard-item'),
ObjectCaptions: () => import(/* webpackChunkName: "object-captions" */'app/components/object-captions/object-captions'),
ObjectCategories: () => import(/* webpackChunkName: "object-categories" */'app/components/object-categories/object-categories'),
PlaceholderList: () => import(/* webpackChunkName: "placeholder-list" */'app/components/placeholder-list/placeholder-list'),
BarChart:() => import(/* webpackChunkName: "bar-chart" */'app/components/charts/bar-chart'),
Expand Down
4 changes: 3 additions & 1 deletion resources/js/app/components/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ export default {
let key = e.which || e.keyCode || 0;
switch (key) {
case 13:
this.go();
if (!e.shiftKey) {
this.go();
}
break;
case 27:
this.popUpAction = '';
Expand Down
Loading
Loading