Skip to content

Misc serendipitous fixes #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 3, 2016
Merged

Misc serendipitous fixes #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e4b6bbb
Fix crops typo
drusepth Oct 1, 2016
f277853
Couple other typos
drusepth Oct 3, 2016
cbe37b4
Merge branch 'master' into serendipitous-improvements
drusepth Oct 3, 2016
14e1226
Merge branch 'master' into serendipitous-improvements
drusepth Oct 3, 2016
2c1da7d
Merge branch 'master' into serendipitous-improvements
drusepth Oct 3, 2016
6fc562c
Merge branch 'master' into serendipitous-improvements
drusepth Oct 3, 2016
a5e9fd7
Merge branch 'master' into serendipitous-improvements
drusepth Oct 3, 2016
0fad235
Merge branch 'master' into serendipitous-improvements
drusepth Oct 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/main/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<div class="col s12 m4">
<div class="icon-block center">
<h2 class="brown-text"><i class="material-icons">assignment_turned_in</i></h2>
<h5>Continuuity checks</h5>
<h5>Continuity checks</h5>
<p class="light">
When every little fact is stored in one place, you can rest easy knowing you won't accidentally contradict yourself.
</p>
Expand Down
5 changes: 3 additions & 2 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ en:
race: What is %{name}’s race?
religion: What religion does %{name} practice?
role: What is %{name}’s role in your story?
skintone: What skin tone does %{name} name?
skintone: What skin tone does %{name} have?
weight: How much does %{name} weigh?

item:
Expand All @@ -94,14 +94,15 @@ en:
name: What is %{name}’s full name?
notes: Do you have any miscellaneous public notes for %{name}?
#original_owner: Who originally owned %{name}?
#past_owners
private_notes: Do you have any private notes for %{name}?
weight: How much does %{name} weigh?
year_made: When was %{name} made?

location:
area: What kind of area is %{name} in?
#capital: What is %{name}’s capital?
crops: What cropes does %{name} produce?
crops: What crops does %{name} produce?
currency: What currencies are used in %{name}?
established_year: When was %{name} established?
language: What languages are spoken in %{name}?
Expand Down