Skip to content

Commit

Permalink
Merge pull request #40411 from nextcloud/artonge/fix/translation
Browse files Browse the repository at this point in the history
Use t and n for translation
  • Loading branch information
artonge authored Sep 15, 2023
2 parents 4a8bb59 + 79d1870 commit 8014762
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 24 deletions.
10 changes: 5 additions & 5 deletions apps/files/src/components/FilesListVirtual.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
import type { PropType } from 'vue'
import type { Node } from '@nextcloud/files'

import { translate, translatePlural } from '@nextcloud/l10n'
import { translate as t, translatePlural as n } from '@nextcloud/l10n'
import { getFileListHeaders, Folder, View } from '@nextcloud/files'
import { showError } from '@nextcloud/dialogs'
import Vue from 'vue'
Expand Down Expand Up @@ -132,14 +132,14 @@ export default Vue.extend({

summaryFile() {
const count = this.files.length
return translatePlural('files', '{count} file', '{count} files', count, { count })
return n('files', '{count} file', '{count} files', count, { count })
},
summaryFolder() {
const count = this.nodes.length - this.files.length
return translatePlural('files', '{count} folder', '{count} folders', count, { count })
return n('files', '{count} folder', '{count} folders', count, { count })
},
summary() {
return translate('files', '{summaryFile} and {summaryFolder}', this)
return t('files', '{summaryFile} and {summaryFolder}', this)
},
isMtimeAvailable() {
// Hide mtime column on narrow screens
Expand Down Expand Up @@ -192,7 +192,7 @@ export default Vue.extend({
return node.fileid
},

t: translate,
t,
},
})
</script>
Expand Down
10 changes: 6 additions & 4 deletions apps/files_versions/src/components/Version.vue
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
import moment from '@nextcloud/moment'
import { translate } from '@nextcloud/l10n'
import { translate as t } from '@nextcloud/l10n'
import { joinPaths } from '@nextcloud/paths'
import { getRootUrl } from '@nextcloud/router'
import { loadState } from '@nextcloud/initial-state'
Expand Down Expand Up @@ -226,14 +226,14 @@ export default {

if (this.isCurrent) {
if (label === '') {
return translate('files_versions', 'Current version')
return t('files_versions', 'Current version')
} else {
return `${label} (${translate('files_versions', 'Current version')})`
return `${label} (${t('files_versions', 'Current version')})`
}
}

if (this.isFirstVersion && label === '') {
return translate('files_versions', 'Initial version')
return t('files_versions', 'Initial version')
}

return label
Expand Down Expand Up @@ -301,6 +301,8 @@ export default {
}
this.$emit('compare', { version: this.version })
},

t,
},
}
</script>
Expand Down
4 changes: 2 additions & 2 deletions dist/614-614.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/614-614.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/core-unsupported-browser.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-unsupported-browser.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-main.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files_versions-files_versions.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files_versions-files_versions.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/weather_status-weather-status.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/weather_status-weather-status.js.map

Large diffs are not rendered by default.

0 comments on commit 8014762

Please sign in to comment.