summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/css/tooltip.scss4
-rw-r--r--core/js/jquery-showpassword.js6
-rw-r--r--core/js/jquery-ui-fixes.js2
-rw-r--r--core/js/js.js16
-rw-r--r--core/js/oc-dialogs.js8
-rw-r--r--core/js/octemplate.js2
-rw-r--r--core/js/placeholder.js2
-rw-r--r--core/js/setup.js2
-rw-r--r--core/js/sharedialogshareelistview.js2
-rw-r--r--core/js/sharedialogview.js11
-rw-r--r--core/js/singleselect.js2
-rw-r--r--core/l10n/fr.js3
-rw-r--r--core/l10n/fr.json3
-rw-r--r--core/l10n/nl.js2
-rw-r--r--core/l10n/nl.json2
-rw-r--r--core/l10n/sv.js12
-rw-r--r--core/l10n/sv.json12
17 files changed, 62 insertions, 29 deletions
diff --git a/core/css/tooltip.scss b/core/css/tooltip.scss
index bad24adf2af..7c6a2f8a580 100644
--- a/core/css/tooltip.scss
+++ b/core/css/tooltip.scss
@@ -33,8 +33,8 @@
z-index: 100000;
filter: alpha(opacity = 0);
&.in {
- opacity: 0.9;
- filter: alpha(opacity = 90);
+ opacity: 1;
+ filter: alpha(opacity = 100);
}
&.top {
diff --git a/core/js/jquery-showpassword.js b/core/js/jquery-showpassword.js
index 23ddf947719..5d518c78bcb 100644
--- a/core/js/jquery-showpassword.js
+++ b/core/js/jquery-showpassword.js
@@ -17,8 +17,8 @@
showPassword: function(c) {
// Setup callback object
- var callback = {'fn':null,'args':{}}
- callback.fn = c;
+ var callback = {'fn':null,'args':{}};
+ callback.fn = c;
// Clones passwords and turn the clones into text inputs
var cloneElement = function( element ) {
@@ -90,7 +90,7 @@
});
$input.bind('keyup', function() {
- update( $input, $clone )
+ update( $input, $clone );
});
$clone.bind('keyup', function(){
diff --git a/core/js/jquery-ui-fixes.js b/core/js/jquery-ui-fixes.js
index 9ccaa38cc47..39f6d7a354e 100644
--- a/core/js/jquery-ui-fixes.js
+++ b/core/js/jquery-ui-fixes.js
@@ -5,4 +5,4 @@
jQuery.ui.autocomplete.prototype._resizeMenu = function () {
var ul = this.menu.element;
ul.outerWidth(this.element.outerWidth());
-}
+};
diff --git a/core/js/js.js b/core/js/js.js
index d601f79033e..b6086846d59 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -150,7 +150,7 @@ var OCP = {},
_.defaults(allOptions, defaultOptions);
var _build = function (text, vars) {
- var vars = vars || [];
+ vars = vars || [];
return text.replace(/{([^{}]*)}/g,
function (a, b) {
var r = (vars[b]);
@@ -1422,7 +1422,7 @@ function initCore() {
} else {
// Close navigation when opening app in
// a new tab
- OC.hideMenus(function(){return false});
+ OC.hideMenus(function(){return false;});
}
});
@@ -1430,7 +1430,7 @@ function initCore() {
if(event.which === 2) {
// Close navigation when opening app in
// a new tab via middle click
- OC.hideMenus(function(){return false});
+ OC.hideMenus(function(){return false;});
}
});
@@ -1444,7 +1444,7 @@ function initCore() {
} else {
// Close navigation when opening app in
// a new tab
- OC.hideMenus(function(){return false});
+ OC.hideMenus(function(){return false;});
}
});
}
@@ -1465,7 +1465,7 @@ function initCore() {
} else {
// Close navigation when opening menu entry in
// a new tab
- OC.hideMenus(function(){return false});
+ OC.hideMenus(function(){return false;});
}
});
@@ -1473,7 +1473,7 @@ function initCore() {
if(event.which === 2) {
// Close navigation when opening app in
// a new tab via middle click
- OC.hideMenus(function(){return false});
+ OC.hideMenus(function(){return false;});
}
});
}
@@ -1884,7 +1884,7 @@ OC.Util = {
* @return {boolean} true if the browser supports SVG, false otherwise
*/
hasSVGSupport: function(){
- return true
+ return true;
},
/**
* If SVG is not supported, replaces the given icon's extension
@@ -2385,4 +2385,4 @@ jQuery.fn.tipsy = function(argument) {
jQuery.fn.tooltip.call(this, argument);
}
return this;
-}
+};
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 92f256699af..5fc224e38bf 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -561,7 +561,7 @@ var OCdialogs = {
.prop('checked', true)
.prop('disabled', true);
$originalDiv.find('.message')
- .text(t('core','read-only'))
+ .text(t('core','read-only'));
}
};
//var selection = controller.getSelection(data.originalFiles);
@@ -813,11 +813,13 @@ var OCdialogs = {
$.each(files, function(idx, entry) {
entry.icon = OC.MimeType.getIconUrl(entry.mimetype);
+ var simpleSize, sizeColor;
if (typeof(entry.size) !== 'undefined' && entry.size >= 0) {
- var simpleSize = humanFileSize(parseInt(entry.size, 10), true);
- var sizeColor = Math.round(160 - Math.pow((entry.size / (1024 * 1024)), 2));
+ simpleSize = humanFileSize(parseInt(entry.size, 10), true);
+ sizeColor = Math.round(160 - Math.pow((entry.size / (1024 * 1024)), 2));
} else {
simpleSize = t('files', 'Pending');
+ sizeColor = 80;
}
var $row = self.$listTmpl.octemplate({
type: entry.type,
diff --git a/core/js/octemplate.js b/core/js/octemplate.js
index b24ad95c2b0..659f795982a 100644
--- a/core/js/octemplate.js
+++ b/core/js/octemplate.js
@@ -94,7 +94,7 @@
};
$.fn.octemplate = function(vars, options) {
- var vars = vars ? vars : {};
+ vars = vars || {};
if(this.length) {
var _template = Object.create(Template);
return _template.init(vars, options, this);
diff --git a/core/js/placeholder.js b/core/js/placeholder.js
index 1b03a28ecca..b8075b5397f 100644
--- a/core/js/placeholder.js
+++ b/core/js/placeholder.js
@@ -71,7 +71,7 @@
}
function rgbToHsl(r, g, b) {
- r /= 255, g /= 255, b /= 255;
+ r /= 255; g /= 255; b /= 255;
var max = Math.max(r, g, b), min = Math.min(r, g, b);
var h, s, l = (max + min) / 2;
if(max === min) {
diff --git a/core/js/setup.js b/core/js/setup.js
index 3c09bb6da49..b3b2049c447 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -66,7 +66,7 @@ $(document).ready(function() {
$('.strengthify-wrapper, .tipsy')
.css('-ms-filter', '"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"')
.css('filter', 'alpha(opacity=30)')
- .css('opacity', .3);
+ .css('opacity', 0.3);
// Create the form
var form = $('<form>');
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index f513eb75848..d51504c3771 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -369,7 +369,7 @@
var shareType = $this.data('share-type');
$this.find('div.avatar, span.username').contactsMenu(shareWith, shareType, $this);
- })
+ });
} else {
var permissionChangeShareId = parseInt(this._renderPermissionChange, 10);
var shareWithIndex = this.model.findShareWithIndex(permissionChangeShareId);
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 007e13dd366..157887fbb94 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -183,15 +183,13 @@
var groups = result.ocs.data.exact.groups.concat(result.ocs.data.groups);
var remotes = result.ocs.data.exact.remotes.concat(result.ocs.data.remotes);
var lookup = result.ocs.data.lookup;
+ var emails = [],
+ circles = [];
if (typeof(result.ocs.data.emails) !== 'undefined') {
- var emails = result.ocs.data.exact.emails.concat(result.ocs.data.emails);
- } else {
- var emails = [];
+ emails = result.ocs.data.exact.emails.concat(result.ocs.data.emails);
}
if (typeof(result.ocs.data.circles) !== 'undefined') {
- var circles = result.ocs.data.exact.circles.concat(result.ocs.data.circles);
- } else {
- var circles = [];
+ circles = result.ocs.data.exact.circles.concat(result.ocs.data.circles);
}
var usersLength;
@@ -199,7 +197,6 @@
var remotesLength;
var emailsLength;
var circlesLength;
- var lookupLength;
var i, j;
diff --git a/core/js/singleselect.js b/core/js/singleselect.js
index 1b2016aabb9..cd0dd52651a 100644
--- a/core/js/singleselect.js
+++ b/core/js/singleselect.js
@@ -8,7 +8,7 @@
input.attr('title', inputTooltip);
}
if (typeof gravity === 'undefined') {
- gravity = 'n'
+ gravity = 'n';
}
select = $(select);
input.css('position', 'absolute');
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 0af1365fa35..edbcce86e91 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -53,6 +53,7 @@ OC.L10N.register(
"Show all contacts …" : "Montrer tous les contacts...",
"There was an error loading your contacts" : "Il y a eu une erreur lors du chargement de vos contacts",
"Loading your contacts …" : "Chargement de vos contacts...",
+ "Looking for {term} …" : "Recherche de {term} ...",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Il y a eu des problèmes à la vérification de l’intégrité du code. Plus d'infos...</a>",
"No action available" : "Aucune action disponible",
"Settings" : "Paramètres",
@@ -167,6 +168,8 @@ OC.L10N.register(
"{sharee} (email)" : "{sharee} (email)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Partager",
+ "Share with other people by entering a user or group, a federated cloud ID or an email address." : "Partager avec d'autres personnes en indiquant un nom d'utilisateur, un groupe, un identifiant cloud ou une adresse email.",
+ "Share with other people by entering a user or group or a federated cloud ID." : "Partager avec d'autres personnes en indiquant un utilisateur, un groupe ou un identifiant cloud.",
"Share with other people by entering a user or group or an email address." : "Partager avec d'autres personnes en indiquant un utilisateur, un groupe ou une adresse email.",
"Name or email address..." : "Nom ou adresse mail...",
"Name or federated cloud ID..." : "Nom ou ID du cloud fédéré...",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 6ec370f579d..500063cc7ea 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -51,6 +51,7 @@
"Show all contacts …" : "Montrer tous les contacts...",
"There was an error loading your contacts" : "Il y a eu une erreur lors du chargement de vos contacts",
"Loading your contacts …" : "Chargement de vos contacts...",
+ "Looking for {term} …" : "Recherche de {term} ...",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Il y a eu des problèmes à la vérification de l’intégrité du code. Plus d'infos...</a>",
"No action available" : "Aucune action disponible",
"Settings" : "Paramètres",
@@ -165,6 +166,8 @@
"{sharee} (email)" : "{sharee} (email)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Partager",
+ "Share with other people by entering a user or group, a federated cloud ID or an email address." : "Partager avec d'autres personnes en indiquant un nom d'utilisateur, un groupe, un identifiant cloud ou une adresse email.",
+ "Share with other people by entering a user or group or a federated cloud ID." : "Partager avec d'autres personnes en indiquant un utilisateur, un groupe ou un identifiant cloud.",
"Share with other people by entering a user or group or an email address." : "Partager avec d'autres personnes en indiquant un utilisateur, un groupe ou une adresse email.",
"Name or email address..." : "Nom ou adresse mail...",
"Name or federated cloud ID..." : "Nom ou ID du cloud fédéré...",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index f373eee36dd..f093534af74 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -57,6 +57,8 @@ OC.L10N.register(
"Loading your contacts …" : "Je contacten wordt geladen ...",
"Looking for {term} …" : "Kijken voor {term} …",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Er traden problemen op tijdens de code betrouwbaarheidscontrole. Meer informatie…</a>",
+ "No action available" : "Geen actie beschikbaar",
+ "Error fetching contact actions" : "Fout bij ophalen contact acties",
"Settings" : "Instellingen",
"Connection to server lost" : "Verbinding met server verbroken",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Probleem met laden pagina, herladen over %n seconde","Probleem met laden pagina, herladen over %n seconden"],
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index 4dee1bc0731..e206946327b 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -55,6 +55,8 @@
"Loading your contacts …" : "Je contacten wordt geladen ...",
"Looking for {term} …" : "Kijken voor {term} …",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Er traden problemen op tijdens de code betrouwbaarheidscontrole. Meer informatie…</a>",
+ "No action available" : "Geen actie beschikbaar",
+ "Error fetching contact actions" : "Fout bij ophalen contact acties",
"Settings" : "Instellingen",
"Connection to server lost" : "Verbinding met server verbroken",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Probleem met laden pagina, herladen over %n seconde","Probleem met laden pagina, herladen over %n seconden"],
diff --git a/core/l10n/sv.js b/core/l10n/sv.js
index b5f8f8bfcc7..27364ee10f5 100644
--- a/core/l10n/sv.js
+++ b/core/l10n/sv.js
@@ -48,7 +48,14 @@ OC.L10N.register(
"%s (incompatible)" : "%s (incompatible)",
"Following apps have been disabled: %s" : "Följande appar har inaktiverats: %s",
"Already up to date" : "Redan uppdaterad",
+ "No contacts found" : "Inga kontakter hittades",
+ "Show all contacts …" : "Visa alla kontakter ...",
+ "There was an error loading your contacts" : "Det uppstod ett fel vid hämtning av dina kontakter",
+ "Loading your contacts …" : "Laddar dina kontakter ...",
+ "Looking for {term} …" : "Letar efter {term} …",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\"> Ett problem uppstod under integritetskontrollen av koden. Mer information ... </a>",
+ "No action available" : "Ingen åtgärd tillgänglig",
+ "Error fetching contact actions" : "Fel vid hämtning av kontakthändelser",
"Settings" : "Inställningar",
"Connection to server lost" : "Anslutning till server förlorad",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem med att ladda sidan, laddar om sidan om %n sekund","Problem med att ladda sidan, laddar om sidan om %n sekunder"],
@@ -157,6 +164,10 @@ OC.L10N.register(
"{sharee} (email)" : "{sharee} (e-post)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Dela",
+ "Name or email address..." : "Namn eller e-postadress",
+ "Name or federated cloud ID..." : "Namn eller federerat cloud-ID",
+ "Name, federated cloud ID or email address..." : "Namn, federerat cloud-ID eller e-postadress...",
+ "Name..." : "Namn...",
"Error removing share" : "Fel uppstod när delning försökte tas bort",
"Non-existing tag #{tag}" : "Icke-existerande tag #{tag}",
"restricted" : "begränsad",
@@ -253,6 +264,7 @@ OC.L10N.register(
"Log in" : "Logga in",
"Stay logged in" : "Fortsätt vara inloggad.",
"Alternative Logins" : "Alternativa inloggningar",
+ "Redirecting …" : "Omdirigerar ...",
"New password" : "Nytt lösenord",
"New Password" : "Nytt lösenord",
"Reset password" : "Återställ lösenord",
diff --git a/core/l10n/sv.json b/core/l10n/sv.json
index e06ab0428ec..2583b380e09 100644
--- a/core/l10n/sv.json
+++ b/core/l10n/sv.json
@@ -46,7 +46,14 @@
"%s (incompatible)" : "%s (incompatible)",
"Following apps have been disabled: %s" : "Följande appar har inaktiverats: %s",
"Already up to date" : "Redan uppdaterad",
+ "No contacts found" : "Inga kontakter hittades",
+ "Show all contacts …" : "Visa alla kontakter ...",
+ "There was an error loading your contacts" : "Det uppstod ett fel vid hämtning av dina kontakter",
+ "Loading your contacts …" : "Laddar dina kontakter ...",
+ "Looking for {term} …" : "Letar efter {term} …",
"<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\"> Ett problem uppstod under integritetskontrollen av koden. Mer information ... </a>",
+ "No action available" : "Ingen åtgärd tillgänglig",
+ "Error fetching contact actions" : "Fel vid hämtning av kontakthändelser",
"Settings" : "Inställningar",
"Connection to server lost" : "Anslutning till server förlorad",
"_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem med att ladda sidan, laddar om sidan om %n sekund","Problem med att ladda sidan, laddar om sidan om %n sekunder"],
@@ -155,6 +162,10 @@
"{sharee} (email)" : "{sharee} (e-post)",
"{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
"Share" : "Dela",
+ "Name or email address..." : "Namn eller e-postadress",
+ "Name or federated cloud ID..." : "Namn eller federerat cloud-ID",
+ "Name, federated cloud ID or email address..." : "Namn, federerat cloud-ID eller e-postadress...",
+ "Name..." : "Namn...",
"Error removing share" : "Fel uppstod när delning försökte tas bort",
"Non-existing tag #{tag}" : "Icke-existerande tag #{tag}",
"restricted" : "begränsad",
@@ -251,6 +262,7 @@
"Log in" : "Logga in",
"Stay logged in" : "Fortsätt vara inloggad.",
"Alternative Logins" : "Alternativa inloggningar",
+ "Redirecting …" : "Omdirigerar ...",
"New password" : "Nytt lösenord",
"New Password" : "Nytt lösenord",
"Reset password" : "Återställ lösenord",
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 07:08:47 +0000