jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge https://github.com/friendica/friendica into pull

Browse source
This commit is contained in:
friendica 2013-01-03 03:50:17 -08:00
commit 0d5b8dfafd
8 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
js/acl.js
View file

@ -253,10 +253,9 @@ ACL.prototype.populate = function(data){
//console.log(html);
that.list_content.append(html);
});
$(".acl-list-item img[data-src]").each(function(i, el){
// Replace data-src attribute with src attribute for every image
$(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){
// Add src attribute for images with a data-src attribute
$(el).attr('src', $(el).data("src"));
$(el).removeAttr("data-src");
});
that.update_view();
}

3
js/main.js
View file

@ -183,9 +183,8 @@
});
$("img[data-src]", nnm).each(function(i, el){
// Replace data-src attribute with src attribute for every image
// Add src attribute for images with a data-src attribute
$(el).attr('src', $(el).data("src"));
$(el).removeAttr("data-src");
});
}

12
view/de/messages.po
View file

@ -16,16 +16,16 @@
# <matthias@matthiasmoritz.de>, 2012.
# Oliver <post@toktan.org>, 2012.
# <sebastian@sebsen.net>, 2012.
# <tobias.diekershoff@gmx.net>, 2011-2012.
# <tobias.diekershoff@gmx.net>, 2011-2013.
# <transifex@zottel.net>, 2011-2012.
# <ts+transifex@ml.tschlotfeldt.de>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
"POT-Creation-Date: 2012-12-31 10:00-0800\n"
"PO-Revision-Date: 2012-12-31 11:02+0000\n"
"Last-Translator: Sennewood <sebastian@sebsen.net>\n"
"POT-Creation-Date: 2013-01-01 10:00-0800\n"
"PO-Revision-Date: 2013-01-02 10:07+0000\n"
"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -9567,11 +9567,11 @@ msgstr "%s mag das nicht."
#: ../../include/conversation.php:884
msgid "like this"
msgstr "mag ich"
msgstr "mögen dies"
#: ../../include/conversation.php:888
msgid "don't like this"
msgstr "mag ich nicht"
msgstr "mögen dies nicht"
#: ../../include/conversation.php:895
msgid "people"

4
view/de/strings.php
View file

@ -2059,8 +2059,8 @@ $a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge";
$a->strings["Follow Thread"] = "Folge der Unterhaltung";
$a->strings["%s likes this."] = "%s mag das.";
$a->strings["%s doesn't like this."] = "%s mag das nicht.";
$a->strings["like this"] = "mag ich";
$a->strings["don't like this"] = "mag ich nicht";
$a->strings["like this"] = "mögen dies";
$a->strings["don't like this"] = "mögen dies nicht";
$a->strings["people"] = "Leute";
$a->strings["and"] = "und";
$a->strings[", and %d other people"] = " und %d andere";

5
view/theme/frost-mobile/js/acl.js
View file

@ -253,10 +253,9 @@ ACL.prototype.populate = function(data){
//console.log(html);
that.list_content.append(html);
});
$(".acl-list-item img[data-src]").each(function(i, el){
// Replace data-src attribute with src attribute for every image
$(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){
// Add src attribute for images with a data-src attribute
$(el).attr('src', $(el).data("src"));
$(el).removeAttr("data-src");
});
that.update_view();
}

3
view/theme/frost-mobile/js/main.js
View file

@ -189,9 +189,8 @@
});
$("img[data-src]", nnm).each(function(i, el){
// Replace data-src attribute with src attribute for every image
// Add src attribute for images with a data-src attribute
$(el).attr('src', $(el).data("src"));
$(el).removeAttr("data-src");
});
}
notif = eNotif.attr('count');

5
view/theme/frost/js/acl.js
View file

@ -253,10 +253,9 @@ ACL.prototype.populate = function(data){
//console.log(html);
that.list_content.append(html);
});
$(".acl-list-item img[data-src]").each(function(i, el){
// Replace data-src attribute with src attribute for every image
$(".acl-list-item[rel!=acl-template] img[data-src]").each(function(i, el){
// Add src attribute for images with a data-src attribute
$(el).attr('src', $(el).data("src"));
$(el).removeAttr("data-src");
});
that.update_view();
}

3
view/theme/frost/js/main.js
View file

@ -181,9 +181,8 @@
});
$("img[data-src]", nnm).each(function(i, el){
// Replace data-src attribute with src attribute for every image
// Add src attribute for images with a data-src attribute
$(el).attr('src', $(el).data("src"));
$(el).removeAttr("data-src");
});
}
notif = eNotif.attr('count');