Skip to content

[stable31] fix(l10n): remove breaking trailing dot after curly brace #2911

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.

Sign up for GitHub

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

Merged
skjnldsv merged 1 commit into from
Apr 8, 2025
Merged

[stable31] fix(l10n): remove breaking trailing dot after curly brace #2911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions js/photos-dashboard.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-dashboard.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-public.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-public.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-src_views_SharedAlbums_vue.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-src_views_SharedAlbums_vue.js.map
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions src/store/collections.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ const actions = {
if (error.response.status !== 409) { // Already in the collection.
context.commit('removeFilesFromCollection', { collectionFileName, fileIdsToRemove: [fileId] })

logger.error(t('photos', 'Failed to add {fileBaseName} to collection {collectionFileName}.', { fileBaseName: file.basename, collectionFileName }), { error })
showError(t('photos', 'Failed to add {fileBaseName} to collection {collectionFileName}.', { fileBaseName: file.basename, collectionFileName }))
logger.error(t('photos', 'Failed to add {fileBaseName} to collection {collectionFileName}', { fileBaseName: file.basename, collectionFileName }), { error })
showError(t('photos', 'Failed to add {fileBaseName} to collection {collectionFileName}', { fileBaseName: file.basename, collectionFileName }))
}
} finally {
semaphore.release(symbol)
Expand Down Expand Up @@ -216,8 +216,8 @@ const actions = {
} catch (error) {
context.commit('addFilesToCollection', { collectionFileName, fileIdsToAdd: [fileId] })

logger.error(t('photos', 'Failed to delete {fileBaseName}.', { fileBaseName: file.basename }), { error })
showError(t('photos', 'Failed to delete {fileBaseName}.', { fileBaseName: file.basename }))
logger.error(t('photos', 'Failed to delete {fileBaseName}', { fileBaseName: file.basename }), { error })
showError(t('photos', 'Failed to delete {fileBaseName}', { fileBaseName: file.basename }))
} finally {
semaphore.release(symbol)
}
Expand All @@ -239,8 +239,8 @@ const actions = {
context.commit('addCollections', { collections: [collection] })
return collection
} catch (error) {
logger.error(t('photos', 'Failed to create {collectionFileName}.', { collectionFileName: collection.filename }), { error })
showError(t('photos', 'Failed to create {collectionFileName}.', { collectionFileName: collection.filename }))
logger.error(t('photos', 'Failed to create {collectionFileName}', { collectionFileName: collection.filename }), { error })
showError(t('photos', 'Failed to create {collectionFileName}', { collectionFileName: collection.filename }))
}
},

Expand Down Expand Up @@ -268,8 +268,8 @@ const actions = {
return newCollection
} catch (error) {
context.commit('removeCollections', { collectionFileNames: [newCollection.filename] })
logger.error(t('photos', 'Failed to rename {currentCollectionFileName} to {newCollectionFileName}.', { currentCollectionFileName: collectionFileName, newCollectionFileName: newCollection.filename }), { error })
showError(t('photos', 'Failed to rename {currentCollectionFileName} to {newCollectionFileName}.', { currentCollectionFileName: collectionFileName, newCollectionFileName: newCollection.filename }))
logger.error(t('photos', 'Failed to rename {currentCollectionFileName} to {newCollectionFileName}', { currentCollectionFileName: collectionFileName, newCollectionFileName: newCollection.filename }), { error })
showError(t('photos', 'Failed to rename {currentCollectionFileName} to {newCollectionFileName}', { currentCollectionFileName: collectionFileName, newCollectionFileName: newCollection.filename }))
return collection
}
},
Expand Down Expand Up @@ -325,8 +325,8 @@ const actions = {
return updatedCollection
} catch (error) {
context.commit('updateCollection', { collection })
logger.error(t('photos', 'Failed to update properties of {collectionFileName} with {properties}.', { collectionFileName, properties: JSON.stringify(properties) }), { error })
showError(t('photos', 'Failed to update properties of {collectionFileName} with {properties}.', { collectionFileName, properties: JSON.stringify(properties) }))
logger.error(t('photos', 'Failed to update properties of {collectionFileName} with {properties}', { collectionFileName, properties: JSON.stringify(properties) }), { error })
showError(t('photos', 'Failed to update properties of {collectionFileName} with {properties}', { collectionFileName, properties: JSON.stringify(properties) }))
return collection
}
},
Expand All @@ -344,8 +344,8 @@ const actions = {
await client.deleteFile(collection.filename)
context.commit('removeCollections', { collectionFileNames: [collectionFileName] })
} catch (error) {
logger.error(t('photos', 'Failed to delete {collectionFileName}.', { collectionFileName }), { error })
showError(t('photos', 'Failed to delete {collectionFileName}.', { collectionFileName }))
logger.error(t('photos', 'Failed to delete {collectionFileName}', { collectionFileName }), { error })
showError(t('photos', 'Failed to delete {collectionFileName}', { collectionFileName }))
}
},
}
Expand Down
16 changes: 8 additions & 8 deletions src/store/faces.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ const actions = {
}
semaphore.release(symbol)
} catch (error) {
logger.error(t('photos', 'Failed to move {fileBaseName} to person {faceName}.', { fileBaseName, faceName }), { error })
showError(t('photos', 'Failed to move {fileBaseName} to person {faceName}.', { fileBaseName, faceName }))
logger.error(t('photos', 'Failed to move {fileBaseName} to person {faceName}', { fileBaseName, faceName }), { error })
showError(t('photos', 'Failed to move {fileBaseName} to person {faceName}', { fileBaseName, faceName }))
semaphore.release(symbol)
throw error
}
Expand Down Expand Up @@ -199,8 +199,8 @@ const actions = {
} catch (error) {
context.commit('addFilesToFace', { faceName, fileIdsToAdd: [fileId] })

logger.error(t('photos', 'Failed to remove {fileBaseName}.', { fileBaseName }), { error })
showError(t('photos', 'Failed to remove {fileBaseName}.', { fileBaseName }))
logger.error(t('photos', 'Failed to remove {fileBaseName}', { fileBaseName }), { error })
showError(t('photos', 'Failed to remove {fileBaseName}', { fileBaseName }))
} finally {
semaphore.release(symbol)
}
Expand Down Expand Up @@ -232,8 +232,8 @@ const actions = {
face = { ...face, basename: faceName }
context.commit('addFaces', { faces: [face] })
} catch (error) {
logger.error(t('photos', 'Failed to rename {oldName} to {faceName}.', { oldName, faceName }), { error })
showError(t('photos', 'Failed to rename {oldName} to {faceName}.', { oldName, faceName }))
logger.error(t('photos', 'Failed to rename {oldName} to {faceName}', { oldName, faceName }), { error })
showError(t('photos', 'Failed to rename {oldName} to {faceName}', { oldName, faceName }))
throw error
}
},
Expand All @@ -250,8 +250,8 @@ const actions = {
await client.deleteFile(`/recognize/${getCurrentUser()?.uid}/faces/${faceName}`)
context.commit('removeFaces', { faceNames: [faceName] })
} catch (error) {
logger.error(t('photos', 'Failed to delete {faceName}.', { faceName }), { error })
showError(t('photos', 'Failed to delete {faceName}.', { faceName }))
logger.error(t('photos', 'Failed to delete {faceName}', { faceName }), { error })
showError(t('photos', 'Failed to delete {faceName}', { faceName }))
}
},
}
Expand Down
8 changes: 4 additions & 4 deletions src/store/files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ const actions = {
try {
await client.deleteFile(file.filename)
} catch (error) {
logger.error(t('photos', 'Failed to delete {fileId}.', { fileId }), { error })
showError(t('photos', 'Failed to delete {fileName}.', { fileName: file.basename }))
logger.error(t('photos', 'Failed to delete {fileId}', { fileId }), { error })
showError(t('photos', 'Failed to delete {fileName}', { fileName: file.basename }))
console.error(error)
context.dispatch('appendFiles', [file])
} finally {
Expand Down Expand Up @@ -222,8 +222,8 @@ const actions = {
)
} catch (error) {
context.commit('favoriteFile', { fileId, favoriteState: favoriteState === 0 ? 1 : 0 })
logger.error(t('photos', 'Failed to set favorite state for {fileId}.', { fileId: file.fileid }), { error })
showError(t('photos', 'Failed to set favorite state for {fileName}.', { fileName: file.basename }))
logger.error(t('photos', 'Failed to set favorite state for {fileId}', { fileId: file.fileid }), { error })
showError(t('photos', 'Failed to set favorite state for {fileName}', { fileName: file.basename }))
}

return semaphore.release(symbole)
Expand Down
2 changes: 1 addition & 1 deletion src/views/SharedAlbums.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<CollectionCover :key="collection.basename"
slot-scope="{collection}"
:link="`/sharedalbums/${collection.basename}`"
:alt-img="t('photos', 'Cover photo for shared album {albumName}.', { albumName: collection.basename })"
:alt-img="t('photos', 'Cover photo for shared album {albumName}', { albumName: collection.basename })"
:data-test="collection.basename"
:cover-url="collection.lastPhoto | coverUrl">
<span class="album__name">
Expand Down
Loading