groove/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2026-07-07 18:01:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'advplyr:master' into multi_move

Browse source
This commit is contained in:
Tiberiu Ichim 2026-02-23 09:45:43 +02:00 • committed by GitHub
commit ff884f1135
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/plugins/i18n.js
View file

@ -6,6 +6,7 @@ const defaultCode = 'en-us'
const languageCodeMap = { const languageCodeMap = {
ar: { label: 'عربي', dateFnsLocale: 'ar' }, ar: { label: 'عربي', dateFnsLocale: 'ar' },
be: { label: 'Беларуская', dateFnsLocale: 'be' },
bg: { label: 'Български', dateFnsLocale: 'bg' }, bg: { label: 'Български', dateFnsLocale: 'bg' },
bn: { label: 'বাংলা', dateFnsLocale: 'bn' }, bn: { label: 'বাংলা', dateFnsLocale: 'bn' },
ca: { label: 'Català', dateFnsLocale: 'ca' }, ca: { label: 'Català', dateFnsLocale: 'ca' },
@ -28,6 +29,7 @@ const languageCodeMap = {
pl: { label: 'Polski', dateFnsLocale: 'pl' }, pl: { label: 'Polski', dateFnsLocale: 'pl' },
'pt-br': { label: 'Português (Brasil)', dateFnsLocale: 'ptBR' }, 'pt-br': { label: 'Português (Brasil)', dateFnsLocale: 'ptBR' },
ru: { label: 'Русский', dateFnsLocale: 'ru' }, ru: { label: 'Русский', dateFnsLocale: 'ru' },
sk: { label: 'Slovenčina', dateFnsLocale: 'sk' },
sl: { label: 'Slovenščina', dateFnsLocale: 'sl' }, sl: { label: 'Slovenščina', dateFnsLocale: 'sl' },
sv: { label: 'Svenska', dateFnsLocale: 'sv' }, sv: { label: 'Svenska', dateFnsLocale: 'sv' },
tr: { label: 'Türkçe', dateFnsLocale: 'tr' }, tr: { label: 'Türkçe', dateFnsLocale: 'tr' },
@ -48,6 +50,7 @@ const podcastSearchRegionMap = {
au: { label: 'Australia' }, au: { label: 'Australia' },
br: { label: 'Brasil' }, br: { label: 'Brasil' },
be: { label: 'België / Belgique / Belgien' }, be: { label: 'België / Belgique / Belgien' },
by: { label: 'Беларусь' },
cz: { label: 'Česko' }, cz: { label: 'Česko' },
dk: { label: 'Danmark' }, dk: { label: 'Danmark' },
de: { label: 'Deutschland' }, de: { label: 'Deutschland' },
@ -67,6 +70,7 @@ const podcastSearchRegionMap = {
pt: { label: 'Portugal' }, pt: { label: 'Portugal' },
ru: { label: 'Россия' }, ru: { label: 'Россия' },
ch: { label: 'Schweiz / Suisse / Svizzera' }, ch: { label: 'Schweiz / Suisse / Svizzera' },
sk: { label: 'Slovensko' },
se: { label: 'Sverige' }, se: { label: 'Sverige' },
vn: { label: 'Việt Nam' }, vn: { label: 'Việt Nam' },
ua: { label: 'Україна' }, ua: { label: 'Україна' },

5
server/controllers/AuthorController.js
View file

@ -113,7 +113,7 @@ class AuthorController {
payload.lastFirst = Database.authorModel.getLastFirst(payload.name) payload.lastFirst = Database.authorModel.getLastFirst(payload.name)
} }
// Check if author name matches another author and merge the authors // Check if author name matches another author in the same library and merge the authors
let existingAuthor = null let existingAuthor = null
if (authorNameUpdate) { if (authorNameUpdate) {
existingAuthor = await Database.authorModel.findOne({ existingAuthor = await Database.authorModel.findOne({
@ -121,7 +121,8 @@ class AuthorController {
id: { id: {
[sequelize.Op.not]: req.author.id [sequelize.Op.not]: req.author.id
}, },
name: payload.name name: payload.name,
libraryId: req.author.libraryId
} }
}) })
} }