Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
diaspora
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gigadoc 2
diaspora
Commits
48f5aed6
Commit
48f5aed6
authored
Jul 17, 2015
by
Rich**
Committed by
Jonne Haß
Jul 17, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make default conversation subject translatable and properly capitalize it
closes #6206, closes #6205
parent
e21dad78
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
app/models/conversation.rb
app/models/conversation.rb
+1
-1
config/locales/diaspora/en.yml
config/locales/diaspora/en.yml
+1
-0
No files found.
app/models/conversation.rb
View file @
48f5aed6
...
...
@@ -83,7 +83,7 @@ class Conversation < ActiveRecord::Base
end
def
subject
self
[
:subject
].
blank?
?
"no subject"
:
self
[
:subject
]
self
[
:subject
].
blank?
?
I18n
.
t
(
"conversations.new.subject_default"
)
:
self
[
:subject
]
end
def
subscribers
(
user
)
...
...
config/locales/diaspora/en.yml
View file @
48f5aed6
...
...
@@ -347,6 +347,7 @@ en:
new
:
to
:
"
To"
subject
:
"
Subject"
subject_default
:
"
No
subject"
send
:
"
Send"
sending
:
"
Sending..."
abandon_changes
:
"
Abandon
changes?"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment