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

Merge pull request #2165 from Pistos/issue-2136-wrong-aspect-button-text

Browse source 
Issue 2136 wrong aspect button text
This commit is contained in:
Gonzalo 2011-10-12 18:47:27 -07:00
commit 12ddf00e16
4 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/locales/javascript/javascript.en.yml
View file

@ -37,9 +37,10 @@ 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: "Add contact"
zero: "Select aspects"
one: "In {{count}} aspect"
two: "In {{count}} aspects"
few: "In {{count}} aspects"

6
public/javascripts/aspects-dropdown.js
View file

@ -11,7 +11,11 @@ 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) {