Put "about" texts in i18n files.

2 files changed, 82 insertions, 91 deletions

diff --git a/web/i18n/en.yml b/web/i18n/en.yml
index a01cd62..38e1d21 100644
--- a/web/i18n/en.yml
+++ b/web/i18n/en.yml
@@ -151,6 +151,80 @@ pages:
             more: More about taginfo...
         international:
             see: See other taginfo sites...
+    about:
+        about_taginfo:
+            title: About taginfo
+            text: |
+                <p>OpenStreetMap uses <b>tags</b> to add meaning to geographic objects. There
+                is no fixed list of those tags. New tags can be invented and used as needed.
+                Everybody can come up with a new tag and add it to new or existing objects.
+                This makes OpenStreetMap enormously flexible, but sometimes also a bit hard
+                to work with.</p>
+                <p>Whether you are contributing to OSM or using the OSM data, there are always
+                questions like: What tags do people use for feature X? What tags can I use
+                for feature Y so that it appears properly on the map? Is the tag Z described
+                on the wiki actually in use and where?</p>
+                <p>Taginfo helps you by showing statistics about which tags are actually in the
+                database, how many people use those tags, where they are used and so on. It
+                also gets information about tags from the wiki and from other places. Taginfo
+                tries to bring together all information about tags to help you understand
+                how they are used and what they mean. See a <a href="/sources">list of sources</a>
+                taginfo uses.</p>
+        about_site:
+            title: About This Site
+        building_on_taginfo:
+            title: Building on taginfo
+            text: |
+                <p>You can use the data from taginfo in your own projects:</p>
+                <h3>API</h3>
+                <p>Taginfo data can be accessed through a REST API. See the
+                <a href="/taginfo/apidoc">API documentation</a> for the details, some general information is
+                <a class="extlink" href="//wiki.openstreetmap.org/wiki/Taginfo/API">on the OSM wiki</a>.
+                The servers running the taginfo API do not have unlimited resources.
+                Please use the API responsibly. If in doubt contact the maintainers of the
+                site you are using or talk to us on the mailing list.</p>
+                <h3>Download</h3>
+                <p>If you want to play around with the data used by taginfo, you can download the
+                regularly updated Sqlite database files. All the preprocessing is done for you.
+                See the <a href="/download">download page</a> for a list of files. Note that
+                some of these files can get quite large. If you want to download them regularly,
+                contact the maintainers of the site you are using or talk to us on the mailing list.</p>
+                <h3>License</h3>
+                <p>The data available through taginfo is licenced under ODbL, the
+                <a class="extlink" href="//www.openstreetmap.org/copyright">same
+                license as the OpenStreetMap data</a>.</p>
+        software:
+            title: The taginfo software
+            text: |
+                <p>The taginfo software was created and is maintained by
+                <a class="extlink" href="//wiki.openstreetmap.org/wiki/User:Joto">Jochen Topf</a>.
+                The web design was created by
+                <a class="extlink" href="http://www.ctd-studio.co.uk/">Christian Topf</a>.</p>
+                <h3>Translations</h3>
+                <p>We need translators for the taginfo user interface. See the <a
+                href="/taginfo/translations">translations overview</a> for languages that need
+                some work. More information on how to help is on the
+                <a class="extlink" href="//wiki.openstreetmap.org/wiki/Taginfo/I18N">OSM wiki</a>.</p>
+                <h3>Code</h3>
+                <p>All the software behind the taginfo sites is Open Source. You can get it on
+                <a class="extlink" href="https://github.com/joto/taginfo/">GitHub</a>. For an overview
+                see the page about the <a class="extlink"
+                href="https://wiki.openstreetmap.org/wiki/Taginfo/Architecture">taginfo
+                architecture</a> on the OSM wiki.</p>
+                <h3>Running your own instance</h3>
+                <p>You can run your own
+                <a class="extlink" href="//wiki.openstreetmap.org/wiki/Taginfo/Sites">taginfo site</a>,
+                for instance with data for just your own country. Instructions are
+                <a class="extlink" href="http://wiki.openstreetmap.org/wiki/Taginfo/Running">on the OSM
+                wiki</a>.</p>
+                <h3>Bug reports and feature requests</h3>
+                <p>Bug reports and feature requests should be directed to the <a class="extlink"
+                href="https://github.com/joto/taginfo/issues">GitHub issue tracker</a>. Or you can
+                come talk to us on the mailing list.</p>
+                <h3>Contact/Mailing list</h3>
+                <p>Contact us on the
+                <a class="extlink" href="//lists.openstreetmap.org/listinfo/taginfo-dev">taginfo-dev mailing list</a>
+                if you have questions or want to help.</p>
     sources:
         intro: |
             <p>Taginfo collects data about OSM tags from several sources and brings them
diff --git a/web/views/about.erb b/web/views/about.erb
index 425b16c..6d7ea54 100644
--- a/web/views/about.erb
+++ b/web/views/about.erb
@@ -1,112 +1,29 @@
 <table class="boxes" width="100%">
     <tr>
-        <td><h2><%= h(t.taginfo.about) %></h2></td>
+        <td><h2><%= h(t.pages.about.about_taginfo.title) %></h2></td>
         <td rowspan="4" width="20"></td>
-        <td><h2>Building on taginfo</h2></td>
+        <td><h2><%= h(t.pages.about.building_on_taginfo.title) %></h2></td>
         <td rowspan="4" width="20"></td>
-        <td><h2>The taginfo Software</h2></td>
+        <td><h2><%= h(t.pages.about.software.title) %></h2></td>
     </tr>
     <tr>
         <td class="box">
-            <p>OpenStreetMap uses <b>tags</b> to add meaning to geographic objects. There
-            is no fixed list of those tags. New tags can be invented and used as needed.
-            Everybody can come up with a new tag and add it to new or existing objects.
-            This makes OpenStreetMap enormously flexible, but sometimes also a bit hard
-            to work with.</p>
-            <p>Whether you are contributing to OSM or using the OSM data, there are always
-            questions like: What tags do people use for feature X? What tags can I use
-            for feature Y so that it appears properly on the map? Is the tag Z described
-            on the wiki actually in use and where?</p>
-            <p>Taginfo helps you by showing statistics about which tags are actually in the
-            database, how many people use those tags, where they are used and so on. It
-            also gets information about tags from the wiki and from other places. Taginfo
-            tries to bring together all information about tags to help you understand
-            how they are used and what they mean. See a <a href="/sources">list of sources</a>
-            taginfo uses.</p>
+<%= t.pages.about.about_taginfo.text %>
         </td>
         <td rowspan="3" class="box">
-            <p>You can use the data from taginfo in your own projects:</p>
-
-            <h3>API</h3>
-
-            <p>Taginfo data can be accessed through a REST API. See the
-            <a href="/taginfo/apidoc">API documentation</a> for the details, some general information is
-            <a class="extlink" href="//wiki.openstreetmap.org/wiki/Taginfo/API">on the OSM wiki</a>.
-            The servers running the taginfo API do not have unlimited resources.
-            Please use the API responsibly. If in doubt contact the maintainers of the
-            site you are using or talk to us on the mailing list.</p>
-
-            <h3>Download</h3>
-
-            <p>If you want to play around with the data used by taginfo, you can download the
-            regularly updated Sqlite database files. All the preprocessing is done for you.
-            See the <a href="/download">download page</a> for a list of files. Note that
-            some of these files can get quite large. If you want to download them regularly,
-            talk to us first on the mailing list.</p>
-
-            <h3>License</h3>
-            <p>The data available through taginfo is licenced under ODbL, the
-            <a class="extlink" href="//www.openstreetmap.org/copyright">same
-            license as the OpenStreetMap data</a>.</p>
-
+<%= t.pages.about.building_on_taginfo.text %>
         </td>
         <td rowspan="3" class="box">
-
-            <p>The taginfo software was created and is maintained by
-            <a class="extlink" href="//wiki.openstreetmap.org/wiki/User:Joto">Jochen Topf</a>.
-            The web design was created by
-            <a class="extlink" href="http://www.ctd-studio.co.uk/">Christian Topf</a>.</p>
-
-            <h3>Translations</h3>
-
-            <p>We need translators for the taginfo user interface. See the <a
-            href="/taginfo/translations">translations overview</a> for languages that need
-            some work. More information on how to help is on the
-            <a class="extlink" href="//wiki.openstreetmap.org/wiki/Taginfo/I18N">OSM wiki</a>.</p>
-
-            <h3>Code</h3>
-
-            <p>All the software behind the taginfo sites is Open Source. You can get it on
-            <a class="extlink" href="https://github.com/joto/taginfo/">GitHub</a>. For an overview
-            see the page about the <a class="extlink"
-            href="https://wiki.openstreetmap.org/wiki/Taginfo/Architecture">taginfo
-            architecture</a> on the OSM wiki.</p>
-
-            <h3>Running your own instance</h3>
-
-            <p>You can run your own
-            <a class="extlink" href="//wiki.openstreetmap.org/wiki/Taginfo/Sites">taginfo site</a>,
-            for instance with data for just your own country. Instructions are
-            <a class="extlink" href="http://wiki.openstreetmap.org/wiki/Taginfo/Running">on the OSM
-            wiki</a>.</p>
-
-            <h3>Bug reports and feature requests</h3>
-
-            <p>Bug reports and feature requests should be directed to the <a class="extlink"
-            href="https://github.com/joto/taginfo/issues">GitHub issue tracker</a>. Or you can
-            come talk to us on the mailing list.</p>
-
-            <h3>Contact/Mailing list</h3>
-
-            <p>Contact us on the
-            <a class="extlink" href="//lists.openstreetmap.org/listinfo/taginfo-dev">taginfo-dev mailing list</a>
-            if you have questions or want to help.</p>
-
+<%= t.pages.about.software.text %>
         </td>
     </tr>
     <tr>
-        <td>
-            <h2>About this site</h2>
-        </td>
+        <td><h2><%= h(t.pages.about.about_site.title) %></h2></td>
     </tr>
     <tr>
         <td class="box">
-            <p>There isn't just one taginfo, there are several. The main taginfo site is
-            at <a href="http://taginfo.openstreetmap.org/">taginfo.openstreetmap.org</a>,
-            but several
-            <a class="extlink" href="http://wiki.openstreetmap.org/wiki/Taginfo/Sites">other taginfo sites</a>
-            are operated by different people.</p>
             <p><%= TaginfoConfig.get('instance.description') %></p>
+            <%= TaginfoConfig.get('instance.about') %>
         </td>
     </tr>
 </table>