mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10071 from nextcloud/apps-fix-message-translation 

Fix hardcoded messages in app details view
This commit is contained in:
Roeland Jago Douma 2018-07-02 09:39:20 +02:00 committed by GitHub
parent a014129804 f4c2a81258
commit 22bb834c48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
settings/css/settings.scss
View File

@ -840,6 +840,11 @@ span.version {
}
.actions {
display: flex;
align-items: center;
.app-groups{
padding: 5px;
}
}
}
@ -1499,7 +1504,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
line-height: 1.3em;
max-height: 2.6em;
overflow : hidden;
/* not supported by all browsers
/* not supported by all browsers
so we keep the overflow hidden
as a fallback */
text-overflow: ellipsis;

2
settings/js/settings-vue.js
View File

File diff suppressed because one or more lines are too long

2
settings/js/settings-vue.js.map
View File

File diff suppressed because one or more lines are too long

4
settings/src/components/appDetails.vue
View File

@ -55,8 +55,8 @@
<div class="app-groups">
<div class="groups-enable" v-if="app.active && canLimitToGroups(app)">
<input type="checkbox" :value="app.id" v-model="groupCheckedAppsData" v-on:change="setGroupLimit" class="groups-enable__checkbox checkbox" :id="prefix('groups_enable', app.id)">
<label :for="prefix('groups_enable', app.id)">Auf Gruppen beschränken</label>
<input type="hidden" class="group_select" title="Alle" value="">
<label :for="prefix('groups_enable', app.id)">{{ t('settings', 'Limit to groups') }}</label>
<input type="hidden" class="group_select" :title="t('settings', 'All')" value="">
<multiselect v-if="isLimitedToGroups(app)" :options="groups" :value="appGroups" @select="addGroupLimitation" @remove="removeGroupLimitation" :options-limit="5"
:placeholder="t('settings', 'Limit app usage to groups')"
label="name" track-by="id" class="multiselect-vue"