Fixed the issue without breaking the aspects dropdown on the [other] user profile page.

This commit is contained in:
Pistos 2011-10-12 09:51:30 -04:00
parent e013e4103f
commit 1c543e3bea
4 changed files with 10 additions and 5 deletions

View file

@ -718,7 +718,7 @@ en:
aspect_dropdown:
add_to_aspect: "Add contact"
toggle:
zero: "Select aspects"
zero: "Add contact"
one: "In %{count} aspect"
two: "In %{count} aspects"
few: "In %{count} aspects"

View file

@ -37,6 +37,7 @@ en:
disconnected: "The websocket is closed; posts will no longer be streamed live."
aspect_dropdown:
add_to_aspect: "Add contact"
select_aspects: "Select aspects"
all_aspects: "All aspects"
toggle:
zero: "Select aspects"

View file

@ -11,10 +11,14 @@ var AspectsDropdown = {
if (number == 0) {
button.removeClass(inAspectClass);
replacement = Diaspora.I18n.t("aspect_dropdown.toggle.zero");
if( dropdown.closest('#publisher').length ) {
replacement = Diaspora.I18n.t("aspect_dropdown.select_aspects");
} else {
replacement = Diaspora.I18n.t("aspect_dropdown.add_to_aspect");
}
}else if (selectedAspects == allAspects) {
replacement = Diaspora.I18n.t('aspect_dropdown.all_aspects');
}else if (number == 1) {
}else if (number == 1) {
button.addClass(inAspectClass);
replacement = dropdown.find(".selected").first().text();
}else if (number < 3) {
@ -28,7 +32,7 @@ var AspectsDropdown = {
button.text(replacement + ' ▼');
},
toggleCheckbox: function(check) {
check.toggleClass('selected');
}

View file

@ -18,7 +18,7 @@ var ContactEdit = {
if (number == 0) {
button.removeClass("in_aspects");
replacement = Diaspora.I18n.t("aspect_dropdown.toggle.zero");
}else if (number == 1) {
}else if (number == 1) {
button.addClass("in_aspects");
replacement = dropdown.find(".selected").first().text();
}else if (number < 3) {