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.

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

Jump to bottom

[full-ci] Fixed some occurences of invalid $gettext usage #6834

Merged
merged 5 commits into from
May 3, 2022
Merged

[full-ci] Fixed some occurences of invalid $gettext usage #6834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5278a24
Fixed some occurences of invalid $gettext usage
kulmann Apr 28, 2022
43ac67c
Convert accessDenied page to typescript to avoid easygettext parsing …
dschmidt Apr 29, 2022
5b5f7ec
Update easygettext to the ownCloud fork
dschmidt Apr 29, 2022
b7f9d87
Update snapshots
dschmidt Apr 29, 2022
3073642
Update easygettext again to remove variable names as msgids
dschmidt Apr 29, 2022
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 packages/web-app-files/src/helpers/contextualHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ function $gettext(msg) {
return msg
}
export const empty = {
text: $gettext(''),
list: [$gettext(''), $gettext(''), $gettext('')]
text: '',
list: ['', '', '']
}
export const shareInviteCollaboratorHelp = {
text: $gettext('Invite persons or groups to access this file or folder.'),
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/src/helpers/share/permission.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class SharePermission {
}

get label(): string {
return $gettext(this._label)
return this._label
}

public enabled(bitmask: number): boolean {
Expand Down
10 changes: 2 additions & 8 deletions packages/web-app-files/src/views/LocationPicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,18 +299,12 @@ export default {
currentHint() {
if (this.currentAction === 'move') {
return this.$gettext(
`Navigate into the desired folder and move selected resources into it.
You can navigate into a folder by clicking on its name.
To navigate back, you can click on the breadcrumbs.
Resources will be moved into the folder where you are currently located.`
'Navigate into the desired folder and move selected resources into it. You can navigate into a folder by clicking on its name. To navigate back, you can click on the breadcrumbs. Resources will be moved into the folder where you are currently located.'
)
}

return this.$gettext(
`Navigate into the desired folder and copy selected resources into it.
You can navigate into a folder by clicking on its name.
To navigate back, you can click on the breadcrumbs.
Resources will be copied into the folder where you are currently located.`
'Navigate into the desired folder and copy selected resources into it. You can navigate into a folder by clicking on its name. To navigate back, you can click on the breadcrumbs. Resources will be copied into the folder where you are currently located.'
)
}
},
kulmann marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
16 changes: 3 additions & 13 deletions packages/web-app-files/tests/unit/views/__snapshots__/LocationPicker.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`LocationPicker files app bar should show current hint according to the current route action 1`] = `
<p data-testid="location-picker-current-hint" class="oc-text-muted oc-text-meta">Navigate into the desired folder and copy selected resources into it.
You can navigate into a folder by clicking on its name.
To navigate back, you can click on the breadcrumbs.
Resources will be copied into the folder where you are currently located.</p>
`;

exports[`LocationPicker files app bar should show current hint according to the current route action 2`] = `
<p data-testid="location-picker-current-hint" class="oc-text-muted oc-text-meta">Navigate into the desired folder and move selected resources into it.
You can navigate into a folder by clicking on its name.
To navigate back, you can click on the breadcrumbs.
Resources will be moved into the folder where you are currently located.</p>
`;
exports[`LocationPicker files app bar should show current hint according to the current route action 1`] = `<p data-testid="location-picker-current-hint" class="oc-text-muted oc-text-meta">Navigate into the desired folder and copy selected resources into it. You can navigate into a folder by clicking on its name. To navigate back, you can click on the breadcrumbs. Resources will be copied into the folder where you are currently located.</p>`;

exports[`LocationPicker files app bar should show current hint according to the current route action 2`] = `<p data-testid="location-picker-current-hint" class="oc-text-muted oc-text-meta">Navigate into the desired folder and move selected resources into it. You can navigate into a folder by clicking on its name. To navigate back, you can click on the breadcrumbs. Resources will be moved into the folder where you are currently located.</p>`;

exports[`LocationPicker files app bar should show location picker selection info according to route action and item 1`] = `<h1 class="location-picker-selection-info oc-mb">Move into »Personal«</h1>`;

Expand Down
6 changes: 3 additions & 3 deletions packages/web-app-user-management/src/views/Users.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,9 @@ export default {
},

toggleSidebarButtonLabel() {
return this.$gettext(
this.sideBarOpen ? 'Close sidebar to hide details' : 'Open sidebar to view details'
)
return this.sideBarOpen
? this.$gettext('Close sidebar to hide details')
: this.$gettext('Open sidebar to view details')
},

toggleSidebarButtonIconFillType() {
Expand Down
2 changes: 1 addition & 1 deletion packages/web-runtime/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@vue/composition-api": "^1.4.9",
"axios": "^0.26.1",
"cross-fetch": "^3.0.6",
"easygettext": "https://github.com/dschmidt/easygettext/archive/refs/tags/v2.17.1.tar.gz",
"easygettext": "https://github.com/owncloud/easygettext/archive/refs/tags/v2.18.1-oc.tar.gz",
"filesize": "^8.0.7",
"focus-trap": "^6.4.0",
"focus-trap-vue": "^1.1.1",
Expand Down
7 changes: 4 additions & 3 deletions packages/web-runtime/src/pages/accessDenied.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@
</div>
</div>
</template>
<script>
<script lang="ts">
import { defineComponent } from '@vue/runtime-core'
import { mapGetters, mapActions } from 'vuex'
export default {
export default defineComponent({
name: 'AccessDeniedPage',
computed: {
...mapGetters(['configuration']),
Expand Down Expand Up @@ -81,5 +82,5 @@ export default {
}
}
}
}
})
</script>
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5490,9 +5490,9 @@ __metadata:
languageName: node
linkType: hard

"easygettext@https://github.com/dschmidt/easygettext/archive/refs/tags/v2.17.1.tar.gz":
"easygettext@https://github.com/owncloud/easygettext/archive/refs/tags/v2.18.1-oc.tar.gz":
version: 2.16.0
resolution: "easygettext@https://github.com/dschmidt/easygettext/archive/refs/tags/v2.17.1.tar.gz"
resolution: "easygettext@https://github.com/owncloud/easygettext/archive/refs/tags/v2.18.1-oc.tar.gz"
dependencies:
"@babel/core": ^7.11.6
"@vue/compiler-sfc": ^3.0.0
Expand All @@ -5513,7 +5513,7 @@ __metadata:
bin:
gettext-compile: ./src/compile-cli.js
gettext-extract: ./src/extract-cli.js
checksum: cc69c55df3190ed20ea1b4c0d9b8b81a7b9baf4e4a1df7664ed951a4b8357a7a36c98b57c5b61cc083463c94308fc2c51bb09577951ee4f48a5c61e10e545e38
checksum: a6aa7f326a8c5c9dff84043eec0476372b58b0a296f68a53567e8ddae559e54c84cae341db2717cf7821956fecba7022eca69301b08df8cdc4dcb33df9a74608
languageName: node
linkType: hard

Expand Down Expand Up @@ -13923,7 +13923,7 @@ __metadata:
"@vue/composition-api": ^1.4.9
axios: ^0.26.1
cross-fetch: ^3.0.6
easygettext: "https://github.com/dschmidt/easygettext/archive/refs/tags/v2.17.1.tar.gz"
easygettext: "https://github.com/owncloud/easygettext/archive/refs/tags/v2.18.1-oc.tar.gz"
filesize: ^8.0.7
focus-trap: ^6.4.0
focus-trap-vue: ^1.1.1
Expand Down