diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 344fbbb6b..1535f7b89 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -4,7 +4,7 @@
module ApplicationHelper
def pod_name
- AppConfig.settings.pod_name.present? ? AppConfig.settings.pod_name : "DIASPORA*"
+ AppConfig.settings.pod_name.present? ? AppConfig.settings.pod_name : "diaspora*"
end
def pod_version
diff --git a/app/mailers/notification_mailers/also_commented.rb b/app/mailers/notification_mailers/also_commented.rb
index cb42fc4df..c0957e5aa 100644
--- a/app/mailers/notification_mailers/also_commented.rb
+++ b/app/mailers/notification_mailers/also_commented.rb
@@ -10,7 +10,7 @@ module NotificationMailers
@comment = Comment.find_by_id(comment_id)
if mail?
- @headers[:from] = "\"#{@comment.author_name} (Diaspora*)\" <#{AppConfig.mail.sender_address}>"
+ @headers[:from] = "\"#{@comment.author_name} (diaspora*)\" <#{AppConfig.mail.sender_address}>"
@headers[:subject] = truncate(strip_markdown(@comment.comment_email_subject.squish), :length => TRUNCATION_LEN)
@headers[:subject] = "Re: #{@headers[:subject]}"
end
diff --git a/app/mailers/notification_mailers/base.rb b/app/mailers/notification_mailers/base.rb
index 980f70e51..06d21ad5d 100644
--- a/app/mailers/notification_mailers/base.rb
+++ b/app/mailers/notification_mailers/base.rb
@@ -3,7 +3,7 @@ module NotificationMailers
class Base
attr_accessor :recipient, :sender
-
+
delegate :unconfirmed_email, :confirm_email_token,
:first_name, to: :recipient, prefix: true
delegate :first_name, :name, :sender, to: :sender, prefix: true
@@ -38,7 +38,7 @@ module NotificationMailers
:to => name_and_address(@recipient.name, @recipient.email)
}
- headers[:from] = "\"#{@sender.name} (Diaspora*)\" <#{AppConfig.mail.sender_address}>" if @sender.present?
+ headers[:from] = "\"#{@sender.name} (diaspora*)\" <#{AppConfig.mail.sender_address}>" if @sender.present?
headers
end
diff --git a/app/mailers/notification_mailers/comment_on_post.rb b/app/mailers/notification_mailers/comment_on_post.rb
index 4eb5faec2..18faa2df7 100644
--- a/app/mailers/notification_mailers/comment_on_post.rb
+++ b/app/mailers/notification_mailers/comment_on_post.rb
@@ -8,7 +8,7 @@ module NotificationMailers
def set_headers(comment_id)
@comment = Comment.find(comment_id)
- @headers[:from] = "\"#{@comment.author_name} (Diaspora*)\" <#{AppConfig.mail.sender_address}>"
+ @headers[:from] = "\"#{@comment.author_name} (diaspora*)\" <#{AppConfig.mail.sender_address}>"
@headers[:subject] = truncate(strip_markdown(@comment.comment_email_subject.squish), :length => TRUNCATION_LEN)
@headers[:subject] = "Re: #{@headers[:subject]}"
end
diff --git a/app/mailers/notification_mailers/private_message.rb b/app/mailers/notification_mailers/private_message.rb
index e39632b7d..6698ba647 100644
--- a/app/mailers/notification_mailers/private_message.rb
+++ b/app/mailers/notification_mailers/private_message.rb
@@ -7,7 +7,7 @@ module NotificationMailers
@conversation = @message.conversation
@participants = @conversation.participants
- @headers[:from] = "\"#{@message.author_name} (Diaspora*)\" <#{AppConfig.mail.sender_address}>"
+ @headers[:from] = "\"#{@message.author_name} (diaspora*)\" <#{AppConfig.mail.sender_address}>"
@headers[:subject] = @conversation.subject.strip
@headers[:subject] = "Re: #{@headers[:subject]}" if @conversation.messages.size > 1
end
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index bf5d4de8f..c2984b64b 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -3,12 +3,11 @@
-# the COPYRIGHT file.
%header
- - unless current_user
- .container{:style => "position:relative;"}
- = link_to content_tag(:div, nil, :class => 'diaspora_header_logo branding-header-logo'), root_path
+ - unless current_user
+ .container{style: "position:relative;"}
+ = link_to content_tag(:div, nil, class: 'diaspora_header_logo branding-header-logo'), root_path
- %ul#landing_nav
- %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
- %li= link_to 'github', "https://github.com/diaspora/diaspora"
- %li= link_to t('.blog'), 'http://blog.diasporafoundation.org/'
- %li= link_to t('.login'), new_user_session_path, :class => 'login'
+ %ul#landing_nav
+ - unless current_page?(controller: :registrations, action: :new)
+ %li= link_to t('devise.shared.links.sign_up'), new_user_registration_path, class: 'login'
+ %li= link_to t('devise.shared.links.sign_in'), new_user_session_path, class: 'login'
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 94f8cd314..cc4f5d82e 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -7,10 +7,10 @@
%head
%title
= page_title yield(:page_title)
-
+
%meta{:charset => 'utf-8'}/
%meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
- %meta{:name => "description", :content => "Diaspora*"}/
+ %meta{:name => "description", :content => "diaspora*"}/
%meta{:name => "author", :content => "Diaspora, Inc."}/
%meta{:property => "og:site_name", :content => "#{AppConfig.settings.pod_name}"}/
diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml
index a478d7058..87ba79c98 100644
--- a/app/views/layouts/application.mobile.haml
+++ b/app/views/layouts/application.mobile.haml
@@ -8,18 +8,18 @@
%title
= pod_name
- %meta{:name => "description", :content => "Diaspora* Mobile"}/
+ %meta{:name => "description", :content => "diaspora* mobile"}/
%meta{:name => "author", :content => "Diaspora, Inc."}/
%meta{:charset => 'utf-8'}/
%meta{:property => "og:site_name", :content => "#{AppConfig.settings.pod_name}"}/
-
+
/ Viewport scale
%meta{:name =>'viewport', :content => "width=device-width, minimum-scale=1 maximum-scale=1"}/
%meta{:name => "HandheldFriendly", :content => "True"}/
%meta{:name => "MobileOptimized", :content => "320"}/
/ Force cleartype on WP7
- %meta{'http-equiv' => "cleartype", :content => 'on'}/
-
+ %meta{'http-equiv' => "cleartype", :content => 'on'}/
+
/ Home screen icon (sized for retina displays)
%link{:rel => 'apple-touch-icon', :href => '/apple-touch-icon.png'}
/ For Nokia devices
@@ -50,7 +50,7 @@
.navbar-inner
.container{:style => "position: relative;"}
= link_to(image_tag('branding/header-logo2x.png', :height => 40, :width => 40, :id => 'header_title'), stream_path)
-
+
- if user_signed_in?
#nav_badges
= link_to(image_tag('icons/my_activity.png', :class => 'my_activity'), activity_stream_path, :class => "badge badge-inverse", :id => "my_activity_badge")
diff --git a/app/views/layouts/notifier.html.erb b/app/views/layouts/notifier.html.erb
index ddc0a59f6..cabab16b6 100644
--- a/app/views/layouts/notifier.html.erb
+++ b/app/views/layouts/notifier.html.erb
@@ -28,7 +28,7 @@
- 
+
|
diff --git a/app/views/people/show.mobile.haml b/app/views/people/show.mobile.haml
index afdaafe2b..381578ded 100644
--- a/app/views/people/show.mobile.haml
+++ b/app/views/people/show.mobile.haml
@@ -4,7 +4,7 @@
- content_for :page_title do
%h1
- DIASPORA*
+ diaspora*
.span12
#author_info
diff --git a/app/views/shared/_links.haml b/app/views/shared/_links.haml
index 074ec453d..052aa956c 100644
--- a/app/views/shared/_links.haml
+++ b/app/views/shared/_links.haml
@@ -1,6 +1,5 @@
-%li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
-%li= link_to 'github', "https://github.com/diaspora/diaspora"
-%li= link_to t('layouts.header.blog'), "http://blog.diasporafoundation.org/"
+%li= link_to 'diasporafoundation.org', "https://diasporafoundation.org"
+%li= link_to 'wiki', "https://wiki.diasporafoundation.org"
%li= link_to t('layouts.application.whats_new'), changelog_url
%li= link_to(t('layouts.header.code') + " " + pod_version, "#{root_path.chomp('/')}/source.tar.gz", {:title => t('layouts.application.source_package')}) unless request.url.match(/joindiaspora.com/)
%li= link_to(t('layouts.application.toggle'), toggle_mobile_path)
diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml
index 17091f6b0..1846abde1 100644
--- a/app/views/shared/_right_sections.html.haml
+++ b/app/views/shared/_right_sections.html.haml
@@ -40,9 +40,9 @@
%br
%br
%p
- != t('aspects.index.help.tutorials_wiki_and_forum', :tutorial => link_to("Diasporial" , "http://diasporial.com/tutorials", :target => '_blank'), :wiki => link_to('Wiki','http://wiki.diasporafoundation.org', :target => '_blank'), :forum => link_to("Forum", "http://www.diasporaforum.org/", :target => '_blank'))
- %p
- != t('aspects.index.help.email_feedback', :link => link_to(t('aspects.index.help.email_link'), "mailto:feedback@joindiaspora.com"))
+ != t('aspects.index.help.tutorials_and_wiki',
+ :tutorial => link_to(t('aspects.index.help.tutorial_link_text'), "https://diasporafoundation.org/getting_started", :target => '_blank'),
+ :wiki => link_to('Wiki','http://wiki.diasporafoundation.org', :target => '_blank'), :target => '_blank')
- unless AppConfig.configured_services.blank? || all_services_connected?
.section
diff --git a/config/defaults.yml b/config/defaults.yml
index 1717e53fc..9c404c99c 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -51,7 +51,7 @@ defaults:
mixpanel_uid:
chartbeat_uid:
settings:
- pod_name: 'Diaspora*'
+ pod_name: 'diaspora*'
enable_registrations: true
autofollow_on_join: true
autofollow_on_join_user: 'diasporahq@joindiaspora.com'
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 009ef6228..857c59709 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -139,7 +139,6 @@ en:
unknown_person: "unknown person"
video_title:
unknown: "Unknown Video Title"
- diaspora_alpha: "DIASPORA* ALPHA"
aspects:
zero: "no aspects"
one: "1 aspect"
@@ -225,7 +224,7 @@ en:
new_here:
title: "Welcome New Users"
- follow: "Follow %{link} and welcome new users to Diaspora*!"
+ follow: "Follow %{link} and welcome new users to diaspora*!"
learn_more: "Learn more"
help:
@@ -238,7 +237,8 @@ en:
tag_bug: "bug"
feature_suggestion: "... have a %{link} suggestion?"
tag_feature: "feature"
- tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
+ tutorials_and_wiki: "%{tutorial} & %{wiki}: Help for your first steps."
+ tutorial_link_text: "Tutorials"
email_feedback: "%{link} your feedback, if you prefer"
email_link: "Email"
any_problem: "Any Problem?"
@@ -377,13 +377,13 @@ en:
invite_someone_to_join: "Invite someone to join Diaspora!"
if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
comma_separated_plz: "You can enter multiple email addresses separated by commas."
- check_out_diaspora: "Hey! You should check out Diaspora*"
+ check_out_diaspora: "Hey! You should check out diaspora*"
to: "To"
personal_message: "Personal message"
send_an_invitation: "Send an invitation"
sending_invitation: "Sending invitation..."
send_invitation: "Send invitation"
- paste_link: "Share this link with your friends to invite them to Diaspora*, or email them the link directly."
+ paste_link: "Share this link with your friends to invite them to diaspora*, or email them the link directly."
codes_left:
zero: "No invites left on this code"
one: "One invite left on this code"
@@ -411,7 +411,7 @@ en:
view_all: "View all"
recent_notifications: "Recent notifications"
application:
- powered_by: "POWERED BY DIASPORA*"
+ powered_by: "POWERED BY diaspora*"
whats_new: "what's new?"
toggle: "toggle mobile"
public_feed: "Public Diaspora Feed for %{name}"
@@ -506,13 +506,13 @@ en:
subject: "A message about your Diaspora account:"
admin: "Your Diaspora administrator"
started_sharing:
- subject: "%{name} started sharing with you on Diaspora*"
+ subject: "%{name} started sharing with you on diaspora*"
sharing: "has started sharing with you!"
view_profile: "View %{name}'s profile"
comment_on_post:
reply: "Reply or view %{name}'s post >"
mentioned:
- subject: "%{name} has mentioned you on Diaspora*"
+ subject: "%{name} has mentioned you on diaspora*"
mentioned: "mentioned you in a post:"
private_message:
reply_to_or_view: "Reply to or view this conversation >"
@@ -525,13 +525,13 @@ en:
confirm_email:
subject: "Please activate your new email address %{unconfirmed_email}"
click_link: "To activate your new email address %{unconfirmed_email}, please follow this link:"
- accept_invite: "Accept Your Diaspora* invite!"
- invited_you: "%{name} invited you to Diaspora*"
+ accept_invite: "Accept Your diaspora* invite!"
+ invited_you: "%{name} invited you to diaspora*"
invite:
message: |-
Hello!
- You have been invited to join Diaspora*!
+ You have been invited to join diaspora*!
Click this link to get started
@@ -540,7 +540,7 @@ en:
Love,
- The Diaspora* email robot!
+ The diaspora* email robot!
[1]: %{invite_url}
people:
@@ -696,7 +696,7 @@ en:
enter_password: "Enter a password (six character minimum)"
enter_password_again: "Enter the same password as before"
hey_make: "HEY,
MAKE
SOMETHING."
- diaspora: "<3 Diaspora*"
+ diaspora: "<3 diaspora*"
sign_up: "SIGN UP"
email: "EMAIL"
username: "USERNAME"
@@ -768,7 +768,7 @@ en:
failure:
error: "there was an error connecting that service"
inviter:
- join_me_on_diaspora: "Join me on DIASPORA*"
+ join_me_on_diaspora: "Join me on diaspora*"
click_link_to_accept_invitation: "Follow this link to accept your invitation"
finder:
fetching_contacts: "Diaspora is populating your %{service} friends, please check back in a few minutes."
@@ -1026,7 +1026,7 @@ en:
well_hello_there: "Well, hello there!"
community_welcome: "Diaspora's community is happy to have you aboard!"
- awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
+ awesome_take_me_to_diaspora: "Awesome! Take me to diaspora*"
who_are_you: "Who are you?"
connect_to_facebook: "We can speed things up a bit by %{link} to Diaspora. This will pull your name and photo, and enable cross-posting."
diff --git a/spec/mailers/notifier_spec.rb b/spec/mailers/notifier_spec.rb
index 187d865e2..47b52139e 100644
--- a/spec/mailers/notifier_spec.rb
+++ b/spec/mailers/notifier_spec.rb
@@ -185,7 +185,7 @@ describe Notifier do
end
it "FROM: contains the sender's name" do
- @mail["From"].to_s.should == "\"#{@cnv.author.name} (Diaspora*)\" <#{AppConfig.mail.sender_address}>"
+ @mail["From"].to_s.should == "\"#{@cnv.author.name} (diaspora*)\" <#{AppConfig.mail.sender_address}>"
end
it 'SUBJECT: has a snippet of the post contents' do
@@ -220,7 +220,7 @@ describe Notifier do
end
it "FROM: contains the sender's name" do
- comment_mail["From"].to_s.should == "\"#{eve.name} (Diaspora*)\" <#{AppConfig.mail.sender_address}>"
+ comment_mail["From"].to_s.should == "\"#{eve.name} (diaspora*)\" <#{AppConfig.mail.sender_address}>"
end
it 'SUBJECT: has a snippet of the post contents, without markdown and without newlines' do
@@ -261,7 +261,7 @@ describe Notifier do
end
it 'FROM: has the name of person commenting as the sender' do
- comment_mail["From"].to_s.should == "\"#{eve.name} (Diaspora*)\" <#{AppConfig.mail.sender_address}>"
+ comment_mail["From"].to_s.should == "\"#{eve.name} (diaspora*)\" <#{AppConfig.mail.sender_address}>"
end
it 'SUBJECT: has a snippet of the post contents, without markdown and without newlines' do