Karavel/fixin.me
0
0
Fork 0
forked from fixin.me/fixin.me
Code Pull Requests Activity

Merging from main master to my repo master. #4

Closed
Karavel wants to merge 53 commits from fixin.me/fixin.me:master into master
pull from: fixin.me/fixin.me:master
merge into: Karavel:master
Conversation 0 Commits 53 Files Changed 50 +2 -1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4c09989788 - Show all commits

2
app/views/default/units/index.html.erb
View File

@ -11,7 +11,7 @@
<tr> <tr>
<th><%= User.human_attribute_name(:symbol).capitalize %></th> <th><%= User.human_attribute_name(:symbol).capitalize %></th>
<% if current_user.at_least(:active) %> <% if current_user.at_least(:active) %>
<th><%= t :actions %></th> <th><%= t '.actions' %></th>
<% end %> <% end %>
</tr> </tr>
</thead> </thead>

1
config/locales/en.yml
View File

@ -74,6 +74,7 @@ en:
export: Export export: Export
import: Import import: Import
index: index:
actions: Actions on defaults
import_all: Import all import_all: Import all
back: Back to units... back: Back to units...
users: users: