Skip to content

Commit

Permalink
Make tutorials more translatable.
Browse files Browse the repository at this point in the history
  • Loading branch information
goobertron committed Aug 21, 2013
1 parent 19cf5ca commit 374f61e
Show file tree
Hide file tree
Showing 14 changed files with 532 additions and 667 deletions.
146 changes: 73 additions & 73 deletions app/views/pages/formatting.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<% content_for :page_title, t('pages.formatting.menu_title') %>
<% content_for :page_title, t('.menu_title') %>
<% content_for :wrapper_class, "index_page" %>

<div id="masthead", class="hero">
<div class="container">
<h1><%= t 'pages.tutorials.headline' %></h1>
<h2><%= t 'pages.formatting.byline' %></h2>
<h2><%= t '.byline' %></h2>
</div>
</div>

Expand All @@ -13,98 +13,98 @@
<div class="span2">&nbsp;
</div>
<div class="span12">
<p><%= t 'pages.formatting.format1' %></p>
<p><%= t 'pages.formatting.format2' %></p>
<p class="more-info"><%= t 'pages.formatting.format3' %><span class="click"><%= t 'pages.getting-started.preview' %></span><%= t 'pages.formatting.format3a' %></p>
<p class="more-info"><%= t 'pages.formatting.format4' %><span class="click"><%= t 'pages.getting-started.preview' %></span><%= t 'pages.formatting.format4a' %></p>
<p><%= t '.format1' %></p>
<p><%= t '.format2' %></p>
<p class="more-info"><%= t('.format3').html_safe %></p>
<p class="more-info"><%= t('.format4').html_safe %></p>

<h3><%= t 'pages.formatting.headings' %></h3>
<p><%= t 'pages.formatting.headings_ex1' %></p>
<pre><%= t 'pages.formatting.headings_code1' %>
<h3><%= t '.headings' %></h3>
<p><%= t '.headings_ex1' %></p>
<pre># <%= t '.headings_code1' %>

<%= t 'pages.formatting.headings_code2' %>
## <%= t '.headings_code2' %>

<%= t 'pages.formatting.headings_code3' %></pre>
<p class="more-info"><%= t 'pages.formatting.headings_ex2' %></p>
### <%= t '.headings_code3' %></pre>
<p class="more-info"><%= t '.headings_ex2' %></p>

<h3><%= t 'pages.formatting.lists' %></h3>
<p><%= t 'pages.formatting.lists_ex1' %></p>
<p><%= t 'pages.formatting.lists_ex2' %></p>
<p class="more-info"><%= t 'pages.formatting.lists_ex3' %></p>
<pre><%= t 'pages.formatting.lists_code1' %>
<h3><%= t '.lists' %></h3>
<p><%= t '.lists_ex1' %></p>
<p><%= t '.lists_ex2' %></p>
<p class="more-info"><%= t '.lists_ex3' %></p>
<pre><%= t '.lists_code1' %>

<%= t 'pages.formatting.lists_code2' %>
<%= t 'pages.formatting.lists_code3' %>
<%= t 'pages.formatting.lists_code4' %>
* <%= t '.lists_code2' %>
* <%= t '.lists_code3' %>
* <%= t '.lists_code4' %>
<%= t 'pages.formatting.lists_code5' %>
<%= t '.lists_code5' %>

<%= t 'pages.formatting.lists_code6' %>
<%= t 'pages.formatting.lists_code7' %>
<%= t 'pages.formatting.lists_code8' %>
- <%= t '.lists_code2' %>
- <%= t '.lists_code3' %>
- <%= t '.lists_code4' %>
<%= t 'pages.formatting.lists_code9' %>
<%= t '.lists_code6' %>

<%= t 'pages.formatting.lists_code10' %>
<%= t 'pages.formatting.lists_code11' %>
<%= t 'pages.formatting.lists_code12' %></pre>
1. <%= t '.lists_code2' %>
2. <%= t '.lists_code3' %>
3. <%= t '.lists_code4' %></pre>

<h3><%= t 'pages.formatting.code' %></h3>
<p><%= t 'pages.formatting.code_ex1' %></p>
<p><%= t 'pages.formatting.code_ex2' %></p>
<p><%= t 'pages.formatting.code_ex3' %> `<code><%= t 'pages.formatting.code_ex4' %></code>`.</p>
<pre><%= t 'pages.formatting.code_code1' %>
<h3><%= t '.code' %></h3>
<p><%= t '.code_ex1' %></p>
<p><%= t '.code_ex2' %></p>
<p><%= t('.code_ex3').html_safe %></p>
<pre><%= t '.code_code1' %>

<%= t 'pages.formatting.code_ticks' %><code><%= t 'pages.formatting.code_code2' %></code><%= t 'pages.formatting.code_ticks' %>
````<code><%= t '.code_code2' %></code>````

<%= t 'pages.formatting.code_code3' %>
<%= t '.code_code3' %>

<code><%= t 'pages.formatting.code_code4' %></code>
<code><%= t 'pages.formatting.code_code5' %></code></pre>
<code><%= t '.code_code4' %></code>
<code><%= t '.code_code5' %></code></pre>

<h3><%= t 'pages.formatting.line' %></h3>
<p><%= t 'pages.formatting.line_ex' %></p>
<pre><%= t 'pages.formatting.line_code1' %>
<%= t 'pages.formatting.line_code2' %>
<%= t 'pages.formatting.line_code3' %></pre>

<h3><%= t 'pages.formatting.itals' %></h3>
<p><%= t 'pages.formatting.itals_ex1' %></p>
<p><em><%= t 'pages.formatting.itals_ex2' %></em><%= t 'pages.formatting.itals_ex3' %></p>
<p><strong><%= t 'pages.formatting.itals_ex4' %></strong><%= t 'pages.formatting.itals_ex5' %></p>
<p><strong><em><%= t 'pages.formatting.itals_ex6' %></em></strong><%= t 'pages.formatting.itals_ex7' %></p>
<p class="more-info"><%= t 'pages.formatting.itals_ex8' %></p>

<h3><%= t 'pages.formatting.links' %></h3>
<p><%= t 'pages.formatting.link_ex1' %><%= link_to t('pages.formatting.link_ex2'), formatting_url %><%= t 'pages.formatting.link_ex3' %></p>
<pre><%= t 'pages.formatting.link_code' %></pre>
<p class="more-info"><%= t 'pages.formatting.link_ex4' %></p>

<h3><%= t 'pages.formatting.images' %></h3>
<p><%= t 'pages.formatting.images_ex1' %></p>
<pre><%= t 'pages.formatting.images_code' %></pre>
<p class="more-info"><%= t 'pages.formatting.images_ex2' %><strong><%= t 'pages.formatting.images_ex2a' %></strong><%= t 'pages.formatting.images_ex2b' %></p>
<p class="more-info"><%= t 'pages.formatting.images_ex3' %></p>

<h3><%= t 'pages.formatting.escape' %></h3>
<p><%= t 'pages.formatting.escape_ex1' %></p>
<pre><%= t 'pages.formatting.escape_code' %></pre>
<p><%= t 'pages.formatting.escape_ex2' %></p>
<p class="more-info"><%= t 'pages.formatting.escape_ex3' %></p>

<h3><%= t 'pages.formatting.symbols' %></h3>
<p><%= t 'pages.formatting.symbols_ex' %></p>
<h3><%= t '.line' %></h3>
<p><%= t '.line_ex' %></p>
<pre><%= t '.line_code1' %>

---

<%= t '.line_code2' %></pre>

<h3><%= t '.itals' %></h3>
<p><%= t '.itals_ex1' %></p>
<p><%= t('.itals_ex2').html_safe %></p>
<p><%= t('.itals_ex3').html_safe %></p>
<p><%= t('.itals_ex4').html_safe %></p>
<p class="more-info"><%= t '.itals_ex8' %></p>

<h3><%= t '.links' %></h3>
<p><%= t('.link_ex1', inline_link: link_to(t('.inline_link_text'), formatting_path)).html_safe %></p>
<pre><%= t '.link_code' %></pre>
<p class="more-info"><%= t '.link_ex2' %></p>

<h3><%= t '.images' %></h3>
<p><%= t '.images_ex1' %></p>
<pre><%= t '.images_code' %></pre>
<p class="more-info"><%= t('.images_ex2').html_safe %></p>
<p class="more-info"><%= t '.images_ex3' %></p>

<h3><%= t '.escape' %></h3>
<p><%= t '.escape_ex1' %></p>
<pre><%= t '.escape_code' %></pre>
<p><%= t '.escape_ex2' %></p>
<p class="more-info"><%= t '.escape_ex3' %></p>

<h3><%= t '.symbols' %></h3>
<p><%= t '.symbols_ex' %></p>
<ul>
<li>"-&gt;" = "→" ; "&lt;-" = "←" ; "&lt;-&gt;" = "↔"</li>
<li>"(c)" = "©" ; "(r)" = "®" ; "(tm)" = ™</li>
<li>"&lt;3″ = "♥ "</li>
<li>"x^2″ = "x²"</li>
</ul>
<p><%= t 'pages.formatting.finish1' %><a href="http://daringfireball.net/projects/markdown/syntax"><%= t 'pages.formatting.finish2' %></a>.</p>
<p><%= t('.finish', markdown_link: link_to(t('.markdown_link_text'), "http://daringfireball.net/projects/markdown/syntax")).html_safe %></p>
<p>&nbsp;</p>
<p align="center"><%= link_to t('pages.tutorials.headline'), tutorials_url %> | <%= link_to t('pages.tutorials.started_head'), getting_started1_url %></p>
<p align="center"><%= link_to t('pages.tutorials.headline'), tutorials_url %> | <%= link_to t('pages.tutorials.started_head'), sign_up_url %></p>

</div>
<div class="span2">
Expand Down
62 changes: 30 additions & 32 deletions app/views/pages/getting_started1.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<% content_for :page_title, t('pages.getting_started1.menu_title') %>
<% content_for :page_title, t('.menu_title') %>
<% content_for :wrapper_class, "index_page" %>

<div id="masthead", class="hero">
<div class="container">
<h1><%= t 'pages.tutorials.started_head' %></h1>
<h2><%= t 'pages.getting_started1.byline' %></h2>
<h2><%= t '.byline' %></h2>
</div>
</div>

Expand All @@ -13,50 +13,48 @@
<div class="span2">&nbsp;
</div>
<div class="span12">
<p class="more-info"><%= t 'pages.getting_started1.welcome' %></p>
<h3><%= t 'pages.getting_started1.find_pod' %></h3>
<p><%= t 'pages.getting_started1.find_pod_ex1' %><em><%= t 'pages.getting_started1.find_pod_ex1a' %></em><%= t 'pages.getting_started1.find_pod_ex1b' %></p>
<p class="more-info"><%= t 'pages.getting_started1.find_pod_ex2' %></p>
<p><%= t 'pages.getting_started1.find_pod_ex3' %>
<a href="https://wiki.diasporafoundation.org/Choosing_a_pod" target="_blank"><%= t 'pages.getting_started1.find_pod_ex4' %></a>
<%= t 'pages.getting_started1.find_pod_ex5' %></p>
<p><%= t 'pages.getting_started1.find_pod_ex6' %></p>
<p class="more-info"><%= t 'pages.getting_started1.find_pod_ex7' %></p>
<h3><%= t 'pages.getting_started1.registration' %></h3>
<p><%= t 'pages.getting_started1.registration1' %><span class="click"><%= t 'click.sign_up' %></span><%= t 'pages.getting_started1.registration1a' %></p>
<p><%= t 'pages.getting_started1.registration2' %></p>
<p class="more-info"><%= t '.welcome' %></p>
<h3><%= t '.find_pod' %></h3>
<p><%= t('.find_pod_ex1').html_safe %></p>
<p class="more-info"><%= t('.find_pod_ex2').html_safe %></p>
<p><%= t('.find_pod_ex3', wiki_link: link_to(t('.wiki_link_text'), "https://wiki.diasporafoundation.org/Choosing_a_pod")).html_safe %></p>
<p><%= t '.find_pod_ex4' %></p>
<p class="more-info"><%= t '.find_pod_ex5' %></p>
<h3><%= t '.registration' %></h3>
<p><%= t('.registration1').html_safe %></p>
<p><%= t '.registration2' %></p>

<div align="center"><%= image_tag "signup.png" %></div>

<p><%= t 'pages.getting_started1.registration3' %><span class="click"><%= t 'click.cont' %></span><%= t 'pages.getting_started1.registration3a' %></p>
<p class="more-info"><%= t 'pages.getting_started1.registration4' %><a href="https://joindiaspora.com/people/f278309aabb991d2" target="_blank">diaspora* HQ</a><%= t 'pages.getting_started1.registration5' %><%= link_to t('pages.tutorials.part4'), getting_started4_url %>.
<p><%= t 'pages.getting_started1.registration6' %></p>
<p><%= t('.registration3').html_safe %></p>
<p class="more-info"><%= t('.registration4', dhq_link: link_to(t('.dhq_link_text'), "http://dia.so/diasporahq"), part4_link: link_to(t('pages.tutorials.part4'), connecting_path)).html_safe %></p>
<p><%= t '.registration5' %></p>

<div align="center"><%= image_tag "gettingstarted.png" %></div>
<p>&nbsp;</p>
<ol>
<li><%= t 'pages.getting_started1.registration7' %></li>
<li><%= t 'pages.getting_started1.registration8' %></li>
<li><%= t 'pages.getting_started1.registration9' %></li>
<li><%= t 'pages.getting_started1.registration10' %></li>
<li><%= t 'pages.getting_started1.registration11' %><span class="click"><%= t 'pages.getting_started1.registration11a' %></span></li>
</ol>
<ol>
<li><%= t '.registration6' %></li>
<li><%= t '.registration7' %></li>
<li><%= t '.registration8' %></li>
<li><%= t '.registration9' %></li>
<li><%= t('.registration10').html_safe %></li>
</ol>

<p><%= t 'pages.getting_started1.profile1' %><span class="click"><%= t 'click.profile' %></span><%= t 'pages.getting_started1.profile1a' %><span class="click"><%= t 'click.edit' %></span><%= t 'pages.getting_started1.profile1b' %></p>
<p><%= t 'pages.getting_started1.profile2' %></p>
<p><%= t('.profile1').html_safe %></p>
<p><%= t '.profile2' %></p>
<div align="center"><%= image_tag "profile-public.png" %></div>
<div align="center"><%= image_tag "profile-private.png" %></div>
<p><%= t 'pages.getting_started1.profile3' %><%= link_to t('pages.tutorials.part7'), getting_started7_url %><%= t 'pages.getting_started1.profile4' %></p>
<p><%= t 'pages.getting_started1.profile5' %><span class="click"><%= t 'click.update' %></span><%= t 'pages.getting_started1.profile5a' %></p>
<%= t('.profile3', part7_link: link_to(t('pages.tutorials.part7'), finishing_path)).html_safe %></p>
<p><%= t('.profile4').html_safe %></p>

<h3><%= t 'pages.getting_started1.finish' %></h3>
<p><%= t 'pages.getting_started1.finish_ex1' %><span class="click"><%= t 'click.stream' %></span><%= t 'pages.getting_started1.finish_ex1a' %></p>
<h3><%= t '.finish' %></h3>
<p><%= t('.finish_ex1').html_safe %></p>
<p>&nbsp;</p>
<p class="more-info"><%= t 'pages.getting_started1.finish_ex2' %><strong><%= t 'pages.getting_started1.finish_ex2a' %></strong><%= t 'pages.getting_started1.finish_ex2b' %><span class="click"><%= t 'click.newhere' %></span><%= t 'pages.getting_started1.finish_ex2c' %><%= link_to t('pages.tutorials.part5'), getting_started5_url %>.</p>
<p class="more-info"><%= t('.finish_ex2', part5_link: link_to(t('pages.tutorials.part5'), sharing_path)).html_safe %></p>

<p>&nbsp;</p>

<p align="center"><%= link_to t('pages.getting_started2.byline'), getting_started2_url %></p>
<p align="center"><%= link_to t('pages.getting_started2.byline'), interface_url %></p>
</div>
<div class="span2">
</div>
Expand Down
Loading

0 comments on commit 374f61e

Please sign in to comment.