From cc1fea92e6aa6014cc1a636572c56b1d2297bd57 Mon Sep 17 00:00:00 2001 From: Pistos Date: Tue, 11 Oct 2011 23:44:28 -0400 Subject: [PATCH 1/3] Whitespace cleanup. --- config/locales/diaspora/en.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index b6ba95914..c2588b34b 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -156,7 +156,7 @@ en: work: "Work" acquaintances: "Acquaintances" friends: "Friends" - index: + index: mentions: "Mentions" featured_users: "Featured Users" community_members: "Featured Diaspora* members" @@ -251,7 +251,7 @@ en: all_contacts: "All Contacts" only_sharing_with_me: "Only sharing with me" remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\"" - many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them." + many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them." featured: featured_users: "Featured Users" @@ -274,7 +274,7 @@ en: sending: "Sending..." abandon_changes: "Abandon changes?" helper: - new_messages: + new_messages: zero: "No new messages" one: "1 new messages" two: "%{count} new messages" @@ -460,7 +460,7 @@ en: index: notifications: "Notifications" mark_all_as_read: "Mark All as Read" - and_others: + and_others: zero: "and nobody else" one: "and one more" two: "and %{count} others" @@ -831,14 +831,14 @@ en: index: revoke_access: "Revoke Access" no_applications: "You haven't registered any applications yet." - + streams: mentions: - title: "Your Mentions" + title: "Your Mentions" contacts_title: "People who mentioned you" tags: title: "Posts tagged: %{tags}" - contacts_title: "People who dig these tags" + contacts_title: "People who dig these tags" public: title: "Public Activity" contacts_title: "Recent Posters" @@ -896,7 +896,7 @@ en: connect_to_your_other_social_networks: "Connect to your other social networks" connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services." connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others." - + connect_with_people: "Connect with cool people" connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your %{bold}." From e013e4103f8aaeac1422432555efeb959a039c31 Mon Sep 17 00:00:00 2001 From: Pistos Date: Tue, 11 Oct 2011 23:44:41 -0400 Subject: [PATCH 2/3] Corrected English for button text when no aspects are selected in publisher. --- config/locales/diaspora/en.yml | 2 +- config/locales/javascript/javascript.en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index c2588b34b..469536c33 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -718,7 +718,7 @@ en: aspect_dropdown: add_to_aspect: "Add contact" toggle: - zero: "Add contact" + zero: "Select aspects" one: "In %{count} aspect" two: "In %{count} aspects" few: "In %{count} aspects" diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml index 13f8ff7bd..cb05d5d85 100644 --- a/config/locales/javascript/javascript.en.yml +++ b/config/locales/javascript/javascript.en.yml @@ -39,7 +39,7 @@ en: add_to_aspect: "Add contact" all_aspects: "All aspects" toggle: - zero: "Add contact" + zero: "Select aspects" one: "In {{count}} aspect" two: "In {{count}} aspects" few: "In {{count}} aspects" From 1c543e3bea21da490f53bec68d01a3a22c93415d Mon Sep 17 00:00:00 2001 From: Pistos Date: Wed, 12 Oct 2011 09:51:30 -0400 Subject: [PATCH 3/3] Fixed the issue without breaking the aspects dropdown on the [other] user profile page. --- config/locales/diaspora/en.yml | 2 +- config/locales/javascript/javascript.en.yml | 1 + public/javascripts/aspects-dropdown.js | 10 +++++++--- public/javascripts/contact-edit.js | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 469536c33..c2588b34b 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -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" diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml index cb05d5d85..26f1dd42b 100644 --- a/config/locales/javascript/javascript.en.yml +++ b/config/locales/javascript/javascript.en.yml @@ -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" diff --git a/public/javascripts/aspects-dropdown.js b/public/javascripts/aspects-dropdown.js index fc8d557d9..8ae0c13bc 100644 --- a/public/javascripts/aspects-dropdown.js +++ b/public/javascripts/aspects-dropdown.js @@ -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'); } diff --git a/public/javascripts/contact-edit.js b/public/javascripts/contact-edit.js index 2a6c9b985..4e55200df 100644 --- a/public/javascripts/contact-edit.js +++ b/public/javascripts/contact-edit.js @@ -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) {