nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

get rid of the hacky callbacks

Browse source
This commit is contained in:
Dan Hansen 2011-01-25 22:21:42 -06:00 committed by maxwell
parent 3078156dbb
commit ee218ecd44
22 changed files with 4 additions and 391 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
public/javascripts/diaspora.js
View file

@ -22,11 +22,11 @@ Diaspora.widgetCollection.prototype.remove = function(widgetId) {
};
Diaspora.widgetCollection.prototype.init = function() {
this.ready = true;
for(var widgetId in this.collection) {
this.collection[widgetId].start();
}
this.ready = true;
for(var widgetId in this.collection) {
this.collection[widgetId].start();
}
}
Diaspora.widgets = Diaspora.widgets || new Diaspora.widgetCollection();

18
public/javascripts/vendor/timeago_locale/jquery.timeago.cz.js vendored
View file

@ -1,18 +0,0 @@
// Czech
jQuery.timeago.settings.strings = {
prefixAgo: "před",
prefixFromNow: null,
suffixAgo: null,
suffixFromNow: null,
seconds: "méně než minutou",
minute: "minutou",
minutes: "%d minutami",
hour: "hodinou",
hours: "%d hodinami",
day: "1 dnem",
days: "%d dny",
month: "1 měsícem",
months: "%d měsíci",
year: "1 rokem",
years: "%d roky"
};

18
public/javascripts/vendor/timeago_locale/jquery.timeago.da.js vendored
View file

@ -1,18 +0,0 @@
// Danish
jQuery.timeago.settings.strings = {
prefixAgo: "for",
prefixFromNow: "om",
suffixAgo: "siden",
suffixFromNow: "",
seconds: "mindre end et minut",
minute: "ca. et minut",
minutes: "%d minutter",
hour: "ca. en time",
hours: "ca. %d timer",
day: "en dag",
days: "%d dage",
month: "ca. en måned",
months: "%d måneder",
year: "ca. et år",
years: "%d år"
};

19
public/javascripts/vendor/timeago_locale/jquery.timeago.de.js vendored
View file

@ -1,19 +0,0 @@
// German
jQuery.timeago.settings.strings = {
prefixAgo: "vor",
prefixFromNow: "in",
suffixAgo: "",
suffixFromNow: "",
seconds: "wenigen Sekunden",
minute: "etwa einer Minute",
minutes: "%d Minuten",
hour: "etwa einer Stunde",
hours: "%d Stunden",
day: "etwa einem Tag",
days: "%d Tagen",
month: "etwa einem Monat",
months: "%d Monaten",
year: "etwa einem Jahr",
years: "%d Jahren"
};

18
public/javascripts/vendor/timeago_locale/jquery.timeago.el.js vendored
View file

@ -1,18 +0,0 @@
// Greek
jQuery.timeago.settings.strings = {
prefixAgo: "πριν",
prefixFromNow: "σε",
suffixAgo: "",
suffixFromNow: "",
seconds: "λιγότερο από ένα λεπτό",
minute: "περίπου ένα λεπτό",
minutes: "%d λεπτά",
hour: "περίπου μία ώρα",
hours: "περίπου %d ώρες",
day: "μία μέρα",
days: "%d μέρες",
month: "περίπου ένα μήνα",
months: "%d μήνες",
year: "περίπου ένα χρόνο",
years: "%d χρόνια"
};

18
public/javascripts/vendor/timeago_locale/jquery.timeago.es.js vendored
View file

@ -1,18 +0,0 @@
// Spanish
jQuery.timeago.settings.strings = {
prefixAgo: "hace",
prefixFromNow: "dentro de",
suffixAgo: "",
suffixFromNow: "",
seconds: "menos de un minuto",
minute: "un minuto",
minutes: "unos %d minutos",
hour: "una hora",
hours: "%d horas",
day: "un día",
days: "%d días",
month: "un mes",
months: "%d meses",
year: "un año",
years: "%d años"
};

17
public/javascripts/vendor/timeago_locale/jquery.timeago.fr.js vendored
View file

@ -1,17 +0,0 @@
// French
jQuery.timeago.settings.strings = {
// environ ~= about, it's optional
prefixAgo: "il y a",
prefixFromNow: "d'ici",
seconds: "moins d'une minute",
minute: "environ une minute",
minutes: "environ %d minutes",
hour: "environ une heure",
hours: "environ %d heures",
day: "environ un jour",
days: "environ %d jours",
month: "environ un mois",
months: "environ %d mois",
year: "un an",
years: "%d ans"
};

18
public/javascripts/vendor/timeago_locale/jquery.timeago.he.js vendored
View file

@ -1,18 +0,0 @@
// Hebrew
jQuery.timeago.settings.strings = {
prefixAgo: "לפני",
prefixFromNow: "מעכשיו",
suffixAgo: "",
suffixFromNow: "",
seconds: "פחות מדקה",
minute: "דקה",
minutes: "%d דקות",
hour: "שעה",
hours: "%d שעות",
day: "יום",
days: "%d ימים",
month: "חודש",
months: "%d חודשים",
year: "שנה",
years: "%d שנים"
};

18
public/javascripts/vendor/timeago_locale/jquery.timeago.hu.js vendored
View file

@ -1,18 +0,0 @@
// Hungarian
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: null,
suffixAgo: null,
suffixFromNow: null,
seconds: "kevesebb mint egy perce",
minute: "körülbelül egy perce",
minutes: "%d perce",
hour: "körülbelül egy órája",
hours: "körülbelül %d órája",
day: "körülbelül egy napja",
days: "%d napja",
month: "körülbelül egy hónapja",
months: "%d hónapja",
year: "körülbelül egy éve",
years: "%d éve"
};

18
public/javascripts/vendor/timeago_locale/jquery.timeago.id.js vendored
View file

@ -1,18 +0,0 @@
// Indonesian
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: null,
suffixAgo: "yang lalu",
suffixFromNow: "dari sekarang",
seconds: "kurang dari semenit",
minute: "sekitar satu menit",
minutes: "%d menit",
hour: "sekitar sejam",
hours: "sekitar %d jam",
day: "sehari",
days: "%d hari",
month: "sekitar sebulan",
months: "%d tahun",
year: "sekitar setahun",
years: "%d tahun"
};

16
public/javascripts/vendor/timeago_locale/jquery.timeago.it.js vendored
View file

@ -1,16 +0,0 @@
// Italian
jQuery.timeago.settings.strings = {
suffixAgo: "fa",
suffixFromNow: "da ora",
seconds: "meno di un minuto",
minute: "circa un minuto",
minutes: "%d minuti",
hour: "circa un'ora",
hours: "circa %d ore",
day: "un giorno",
days: "%d giorni",
month: "circa un mese",
months: "%d mesi",
year: "circa un anno",
years: "%d anni"
};

18
public/javascripts/vendor/timeago_locale/jquery.timeago.ja.js vendored
View file

@ -1,18 +0,0 @@
// Japanese
jQuery.timeago.settings.strings = {
prefixAgo: "",
prefixFromNow: "今から",
suffixAgo: "前",
suffixFromNow: "後",
seconds: "ほんの数秒",
minute: "約一分",
minutes: "%d 分",
hour: "大体一時間",
hours: "大体 %d 時間位",
day: "一日",
days: "%d 日ほど",
month: "大体一ヶ月",
months: "%d ヶ月ほど",
year: "丁度一年（虎舞流ｗ）",
years: "%d 年"
};

16
public/javascripts/vendor/timeago_locale/jquery.timeago.ko.js vendored
View file

@ -1,16 +0,0 @@
// Korean
jQuery.timeago.settings.strings = {
suffixAgo: "전",
suffixFromNow: "후",
seconds: "1분 이내",
minute: "1분",
minutes: "%d분",
hour: "1시간",
hours: "%d시간",
day: "하루",
days: "%d일",
month: "한달",
months: "%d달",
year: "1년",
years: "%d년"
};

16
public/javascripts/vendor/timeago_locale/jquery.timeago.nl.js vendored
View file

@ -1,16 +0,0 @@
// Dutch
jQuery.timeago.settings.strings = {
suffixAgo: "geleden",
suffixFromNow: "vanaf nu",
seconds: "iets minder dan een minute",
minute: "ongeveer een minuut",
minutes: "%d minuten",
hour: "ongeveer een uur",
hours: "ongeveer %d uren",
day: "een dag",
days: "%d dagen",
month: "ongeveer een maand",
months: "%d maanden",
year: "ongeveer een jaar",
years: "%d jaar"
};

31
public/javascripts/vendor/timeago_locale/jquery.timeago.pl.js vendored
View file

@ -1,31 +0,0 @@
// Polish
(function() {
function numpf(n, s, t) {
// s - 2-4, 22-24, 32-34 ...
// t - 5-21, 25-31, ...
var n10 = n % 10;
if ( (n10 > 1) && (n10 < 5) && ( (n > 20) || (n < 10) ) ) {
return s;
} else {
return t;
}
}
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: "za",
suffixAgo: "temu",
suffixFromNow: null,
seconds: "mniej niż minutę",
minute: "minutę",
minutes: function(value) { return numpf(value, "%d minuty", "%d minut"); },
hour: "godzinę",
hours: function(value) { return numpf(value, "%d godziny", "%d godzin"); },
day: "dzień",
days: "%d dni",
month: "miesiąc",
months: function(value) { return numpf(value, "%d miesiące", "%d miesięcy"); },
year: "rok",
years: function(value) { return numpf(value, "%d lata", "%d lat"); }
};
})();

16
public/javascripts/vendor/timeago_locale/jquery.timeago.pt-PT.js vendored
View file

@ -1,16 +0,0 @@
// Portuguese
jQuery.timeago.settings.strings = {
suffixAgo: "atrás",
suffixFromNow: "a partir de agora",
seconds: "menos de um minuto",
minute: "cerca de um minuto",
minutes: "%d minutos",
hour: "cerca de uma hora",
hours: "cerca de %d horas",
day: "um dia",
days: "%d dias",
month: "cerca de um mês",
months: "%d meses",
year: "cerca de um ano",
years: "%d anos"
};

18
public/javascripts/vendor/timeago_locale/jquery.timeago.ro.js vendored
View file

@ -1,18 +0,0 @@
// Romanian
$.timeago.settings.strings = {
prefixAgo: "acum",
prefixFromNow: "in timp de",
suffixAgo: "",
suffixFromNow: "",
seconds: "mai putin de un minut",
minute: "un minut",
minutes: "%d minute",
hour: "o ora",
hours: "%d ore",
day: "o zi",
days: "%d zile",
month: "o luna",
months: "%d luni",
year: "un an",
years: "%d ani"
};

34
public/javascripts/vendor/timeago_locale/jquery.timeago.ru.js vendored
View file

@ -1,34 +0,0 @@
// Russian
(function() {
function numpf(n, f, s, t) {
// f - 1, 21, 31, ...
// s - 2-4, 22-24, 32-34 ...
// t - 5-20, 25-30, ...
var n10 = n % 10;
if ( (n10 == 1) && ( (n == 1) || (n > 20) ) ) {
return f;
} else if ( (n10 > 1) && (n10 < 5) && ( (n > 20) || (n < 10) ) ) {
return s;
} else {
return t;
}
}
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: "через",
suffixAgo: "назад",
suffixFromNow: null,
seconds: "меньше минуты",
minute: "минуту",
minutes: function(value) { return numpf(value, "%d минута", "%d минуты", "%d минут"); },
hour: "час",
hours: function(value) { return numpf(value, "%d час", "%d часа", "%d часов"); },
day: "день",
days: function(value) { return numpf(value, "%d день", "%d дня", "%d дней"); },
month: "месяц",
months: function(value) { return numpf(value, "%d месяц", "%d месяца", "%d месяцев"); },
year: "год",
years: function(value) { return numpf(value, "%d год", "%d года", "%d лет"); }
};
})();

18
public/javascripts/vendor/timeago_locale/jquery.timeago.sv.js vendored
View file

@ -1,18 +0,0 @@
// Swedish
jQuery.timeago.settings.strings = {
prefixAgo: "för",
prefixFromNow: "om",
suffixAgo: "sedan",
suffixFromNow: "",
seconds: "mindre än en minut",
minute: "ungefär en minut",
minutes: "%d minuter",
hour: "ungefär en timme",
hours: "ungefär %d timmar",
day: "en dag",
days: "%d dagar",
month: "ungefär en månad",
months: "%d månader",
year: "ungefär ett år",
years: "%d år"
};

19
public/javascripts/vendor/timeago_locale/jquery.timeago.zh-CN.js vendored
View file

@ -1,19 +0,0 @@
// Simplified Chinese
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: "从现在开始",
suffixAgo: "之前",
suffixFromNow: null,
seconds: "不到 1 分钟",
minute: "大约 1 分钟",
minutes: "%d 分钟",
hour: "大约 1 小时",
hours: "大约 %d 小时",
day: "1 天",
days: "%d 天",
month: "大约 1 个月",
months: "%d 月",
year: "大约 1 年",
years: "%d 年",
numbers: []
}

20
public/javascripts/widgets/i18n.js
View file

@ -8,46 +8,26 @@
Diaspora.widgets.add("i18n", function() {
this.start = $.noop;
this.callbacks = [];
this.language = undefined;
this.locale = undefined;
this.ready = false;
this.loadLocale = function(locale, language) {
this.ready = true;
this.language = language;
if(typeof locale !== "undefined") {
this.locale = locale;
this.triggerCallbacks();
return;
}
if(!this.locale) {
function setLocale(data) {
this.locale = $.parseJSON(data);
this.triggerCallbacks();
}
$.getJSON("/localize", setLocale);
}
};
this.triggerCallbacks = function() {
for(var i = 0; i < this.callbacks.length; i++) {
this.callbacks[i]();
}
};
this.onLocaleLoaded = function(callback) {
if(this.ready) {
callback();
return;
}
this.callbacks.push(callback);
};
this.t = function(item, views) {
var ret,
_item = item.split(".");

3
public/javascripts/widgets/timeago.js
View file

@ -7,8 +7,6 @@
*/
Diaspora.widgets.add("timeago", function() {
this.start = function() {
Diaspora.widgets.i18n.onLocaleLoaded(function() {
if(Diaspora.widgets.i18n.language === "en") {
return;
}
@ -32,7 +30,6 @@ Diaspora.widgets.add("timeago", function() {
};
Diaspora.widgets.timeago.updateTimeAgo("abbr");
});
};
this.updateTimeAgo = function(selector) {