Merge pull request #20 from scambra/undo-l10n
undo interpolation in js for 4.5
This commit is contained in:
commit
7f6a984e57
|
@ -127,9 +127,9 @@ OC.Share={
|
||||||
var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
|
var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
|
||||||
if (data.reshare) {
|
if (data.reshare) {
|
||||||
if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) {
|
if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) {
|
||||||
html += '<span class="reshare">'+t('core', 'Shared with you and the group %s by %s', data.reshare.share_with, data.reshare.uid_owner)+'</span>';
|
html += '<span class="reshare">'+t('core', 'Shared with you and the group')+' '+data.reshare.share_with+' '+t('core', 'by')+' '+data.reshare.uid_owner+'</span>';
|
||||||
} else {
|
} else {
|
||||||
html += '<span class="reshare">'+t('core', 'Shared with you by %s', data.reshare.uid_owner)+'</span>';
|
html += '<span class="reshare">'+t('core', 'Shared with you by')+' '+data.reshare.uid_owner+'</span>';
|
||||||
}
|
}
|
||||||
html += '<br />';
|
html += '<br />';
|
||||||
}
|
}
|
||||||
|
@ -182,7 +182,7 @@ OC.Share={
|
||||||
// Suggest sharing via email if valid email address
|
// Suggest sharing via email if valid email address
|
||||||
// var pattern = new RegExp(/^[+a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/i);
|
// var pattern = new RegExp(/^[+a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/i);
|
||||||
// if (pattern.test(search.term)) {
|
// if (pattern.test(search.term)) {
|
||||||
// response([{label: t('core', 'Share via email: %s', search.term), value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
|
// response([{label: t('core', 'Share via email:')+' '+search.term, value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
|
||||||
// } else {
|
// } else {
|
||||||
response([t('core', 'No people found')]);
|
response([t('core', 'No people found')]);
|
||||||
// }
|
// }
|
||||||
|
@ -247,7 +247,7 @@ OC.Share={
|
||||||
if (collectionList.length > 0) {
|
if (collectionList.length > 0) {
|
||||||
$(collectionList).append(', '+shareWith);
|
$(collectionList).append(', '+shareWith);
|
||||||
} else {
|
} else {
|
||||||
var html = '<li style="clear: both;" data-collection="'+item+'">'+t('core', 'Shared in %s with %s', item, shareWith)+'</li>';
|
var html = '<li style="clear: both;" data-collection="'+item+'">'+t('core', 'Shared in')+' '+item+' '+t('core', 'with')+' '+shareWith+'</li>';
|
||||||
$('#shareWithList').prepend(html);
|
$('#shareWithList').prepend(html);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue