Merge branch 'master' of git.moose.perl.org:moose-website

diff --git a/data/pages.yml b/data/pages.yml
index ba611f3..0483471 100644 (file)
--- a/data/pages.yml
+++ b/data/pages.yml
@@ -129,49 +129,49 @@
         - url   : http://blog.moose.perl.org/2011/01/the-moose-ecosystem.html
           title :
             en : A discussion of the Moose Ecosystem on our blog
-            de : A discussion of the Moose Ecosystem on our blog
+            de : Eine Erörterung des Moose-Ökosystems in unserem Blog
         - url   : http://blogs.perl.org/users/preaction/2011/01/whats-new-in-webgui-80-1---psgiplack.html
           title :
             en : The WebGUI folks talk about version 8.0 (which uses Moose)
-            de : The WebGUI folks talk about version 8.0 (which uses Moose)
+            de : die WebGUI-Leute reden über Version 8.0, die Moose benutzt
         - url   : http://www.modernperlbooks.com/mt/2011/01/the-parametric-role-of-my-mvc-plugin-system.html
           title :
             en: chromatic discusses Parameterized roles with Moose
-            de: chromatic discusses Parameterized roles with Moose
+            de: chromatic erörtert parameterisierte Rollen mit Moose
     - year     : 2010
       articles :
         - url   : http://blogs.perl.org/users/jt_smith/2010/10/why-the-lacuna-expanse-is-good-for-perl.html
           title :
             en: JT Smith talks about Lacuna Expanse (which uses Moose)
-            de: JT Smith talks about Lacuna Expanse (which uses Moose)
+            de: JT Smith redet über Lacuna Expanse, das Moose benutzt
         - url   : http://www.modernperlbooks.com/mt/2010/09/the-right-approach-to-deprecation.html
           title :
             en: chromatic discusses the Moose deprecation policy
-            de: chromatic discusses the Moose deprecation policy
+            de: chromatic erörtert die Richtlinien zur Antiquierung in Moose
         - url   : http://blog.woobling.org/2010/09/moose-has-won.html
           title :
             en : Yuval Kogman declares "Moose has won".
-            de : Yuval Kogman erklärt "Moose has won".
+            de : Yuval Kogman stellt fest, dass Moose gewonnen hat.
         - url   : http://www.morungos.com/node/90
           title :
             en : Stuart Watt talks about how Perl and LISP are both "language survivors"
-            de : Stuart Watt talks about how Perl and LISP are both "language survivors"
+            de : Stuart Watt redet darüber, wie Perl und LISP überleben
         - url   : http://www.modernperlbooks.com/mt/2010/09/what-you-can-and-cannot-teach-about-encapsulation.html
           title :
             en : chromatic talks about Encapsulation and Moose
-            de : chromatic talks about Encapsulation and Moose
+            de : chromatic redet über Datenkapselung und Moose
         - url   : http://perlgeek.de/blog-en/perl-tips/what-is-modern-perl.html
           title :
             en : Moritz Lenz asks What is "Modern Perl"?
-            de : Moritz Lenz asks What is "Modern Perl"?
+            de : 'Moritz Lenz fragt: Was ist "modernes Perl"?'
         - url   : http://www.catalyzed.org/2010/04/moosexappcmd-and-your-command-line-apps.html
           title :
-            en : Devin Austin talks about MooseX::App::Cmd
-            de : Devin Austin talks about MooseX::App::Cmd
+            en : Devin Austin talks about <code>MooseX::App::Cmd</code>
+            de : Devin Austin redet über <code>MooseX::App::Cmd</code>
         - url   : http://blogs.perl.org/users/jt_smith/2010/04/the-second-age-of-perl.html
           title :
             en : JT Smith declares The Second Age of Perl
-            de : JT Smith erklärt der Second Age of Perl
+            de : JT Smith verkündet die zweite Perl-Ära
         - url   : http://stevan-little.blogspot.com/2010/03/moose-100-is-released.html
           title :
             en : Moose 1.00 is Released
@@ -402,16 +402,16 @@
           url   : http://prezi.com/fgdoyw0smyqo/perl-object-oriented-programming/
         - title :
             en : Stevan Little's keynote at <acronym title='Yet Another Perl Conference - North America'>YAPC::NA</acronym> 2010
-            de : Vortrag von Stevan Little beim <acronym title='Yet Another Perl Conference - North America'>YAPC::NA</acronym> 2010
+            de : Vortrag von Stevan Little auf der <acronym title='Yet Another Perl Conference - North America'>YAPC::NA</acronym> 2010
           url   : http://www.iinteractive.com/yapc/slides.html
           video : http://www.presentingperl.org/yn2010/modern-perl/
         - title :
             en : Jesse Luehrs's "Extending Moose" talk at <acronym title='Yet Another Perl Conference - North America'>YAPC::NA</acronym> 2010
-            de : Vortrag von Jesse Luehrs beim <acronym title='Yet Another Perl Conference - North America'>YAPC::NA</acronym> 2010
+            de : Vortrag von Jesse Luehrs auf der <acronym title='Yet Another Perl Conference - North America'>YAPC::NA</acronym> 2010
           url   : http://tozt.net/talks/extending_moose_yapc_na_2010/
         - title :
-            en : Shawn Moore's "NonHierachical OOP" talk at <acronym title="Open Source Developers'' Conference - Taiwan">osdc.tw</acronym>
-            de : Vortrag von Shawn Moore beim <acronym title="Open Source Developers'' Conference - Taiwan">osdc.tw</acronym>
+            en : Shawn Moore's "Non-hierarchical <acronym title='object-oriented programming'>OOP</acronym>" talk at <acronym title="Open Source Developers'' Conference - Taiwan">osdc.tw</acronym>
+            de : Vortrag von Shawn Moore auf der <acronym title="Open Source Developers'' Conference - Taiwan">osdc.tw</acronym>
           url   : http://sartak.org/talks/osdc.tw-2010/nonhierarchical-oop/nonhierarchical-oop.pdf
         - title :
             en : Stevan Little's talk at <acronym title="Orlando Perl workshop">OPW</acronym>

diff --git a/lib/Moose/Website/I18N/po/de.po b/lib/Moose/Website/I18N/po/de.po
index 3a0c525..c125502 100644 (file)
--- a/lib/Moose/Website/I18N/po/de.po
+++ b/lib/Moose/Website/I18N/po/de.po
@@ -81,10 +81,10 @@ msgstr ""
 "bekommen hast, was man mit Moose machen kann, kannst du die <acronym "
 "title='application programming interface'>API</acronym>-Dokumentation "
 "benutzen, um die Details von interessanten Merkmalen nachzuschlagen.</p>"
-"<p>Moose ist auch in einigen Büchern prominent vertreten:"
+"<p>Moose ist auch in einigen Büchern prominent vertreten:</p>"
 "<ul>"
 "<li><a href='http://www.onyxneon.com/books/modern_perl/index.html'>Modern Perl</a></li>"
-"<li><a href='http://apress.com/book/view/1430223650'>The Definitive Guide to Catalyst</a></li>"
+"<li><a href='http://apress.com/book/view/1430223650' xml:lang='en'>The Definitive Guide to Catalyst</a></li>"
 "</ul>"
 
 msgid "about organization list header"

diff --git a/lib/Moose/Website/I18N/po/en.po b/lib/Moose/Website/I18N/po/en.po
index 3f1b6a4..8f90133 100644 (file)
--- a/lib/Moose/Website/I18N/po/en.po
+++ b/lib/Moose/Website/I18N/po/en.po
@@ -57,7 +57,7 @@ msgid "about new to moose body"
 msgstr ""
 "<p>If you're new to Moose, the best place to start is the <a href='http://search.cpan.org/dist/Moose/lib/Moose/Manual.pod'><code>Moose::Manual</code></a> docs, followed by the <a href='http://search.cpan.org/dist/Moose/lib/Moose/Cookbook.pod'><code>Moose::Cookbook</code></a>. The introduction will show you what Moose is, and how it makes Perl 5 <acronym title='object orientation'>OO</acronym> better.</p>"
 "<p>The cookbook recipes on Moose basics will get you up to speed with many of Moose's features quickly. Once you have an idea of what Moose can do, you can use the <acronym title='application programming interface'>API</acronym> documentation to get more detail on features which interest you.</p>"
-"<p>Moose is also featured prominently in a couple of books:"
+"<p>Moose is also featured prominently in a couple of books:</p>"
 "<ul>"
 "<li><a href='http://www.onyxneon.com/books/modern_perl/index.html'>Modern Perl</a></li>"
 "<li><a href='http://apress.com/book/view/1430223650'>The Definitive Guide to Catalyst</a></li>"

diff --git a/lib/Moose/Website/Resource/Templates/about.tt b/lib/Moose/Website/Resource/Templates/about.tt
index a983ec6..793a87a 100644 (file)
--- a/lib/Moose/Website/Resource/Templates/about.tt
+++ b/lib/Moose/Website/Resource/Templates/about.tt
@@ -9,11 +9,10 @@
     <h3>[% loc('about new to moose header') %]</h3>
     [% loc('about new to moose body') %]
 
-    <a name="organizations"></a>
-    <h3>[% loc('about organization list header') %]</h3>
+    <h3 id="organizations">[% loc('about organization list header') %]</h3>
     [% loc('about organization list body') %]
 
-    <ul>
+    <ul xml:lang="en">
     [% FOREACH org IN current_page.data.organizations.sort('name') %]
         <li><a href="[% org.url %]">[% org.name %]</a></li>
     [% END %]

diff --git a/lib/Moose/Website/Resource/Templates/shared/footer.tt b/lib/Moose/Website/Resource/Templates/shared/footer.tt
index 3da5c17..9bc5b59 100644 (file)
--- a/lib/Moose/Website/Resource/Templates/shared/footer.tt
+++ b/lib/Moose/Website/Resource/Templates/shared/footer.tt
@@ -1,2 +1,3 @@
+<p><a href="/moose/de" xml:lang="de">deutsch</a> <a href="/moose" xml:lang="en">English</a></p>
 <p>[% loc('footer copyright') %]</p>
 <p>[% loc('footer terms') %]</p>
\ No newline at end of file

diff --git a/t/02-spelling.t b/t/02-spelling.t
index c0c5027..07b0ec8 100644 (file)
--- a/t/02-spelling.t
+++ b/t/02-spelling.t
@@ -96,12 +96,16 @@ en:
 - Grünauer
 - hakobe's
 - hanekomu
+- JT
 - Hengst's
 # Kanat-Alexander
 - Kanat
+- Kogman
 - Kogman's
 - Kuri's
+- Lenz
 - Léon
+- Luehrs's
 - Napiorkowski
 - Pearcey's
 - Prather
@@ -121,7 +125,10 @@ en:
 - Yuval
 
 ## proper names
+- AirG
 - BizRate
+- CATH
+- CLAB
 - Cisco
 - Cloudtone
 - DoctorBase
@@ -132,6 +139,7 @@ en:
 # Kansai.pm
 - Kansai
 - LinuxMag
+- Matsch
 - MedTouch
 - MusicBrainz
 - OCaml
@@ -148,16 +156,21 @@ en:
 - Takkle
 - Tamarou
 - TextMate
+- UNMC
+- UNO
 - ValueClick
+- WebGUI
 
 ## Moose-specific
 
 ## computerese
+- Parameterized
 - parameterized
 
 ## other jargon
 
 ## neologisms
+- Blog
 - blog
 - podcast
 
@@ -185,6 +198,7 @@ de:
 
 ## Personennamen
 - Apocalypse
+- Austin
 - Austins
 - Barry
 - Boones
@@ -209,15 +223,20 @@ de:
 - hanekomu
 - Hengsts
 - Jay
+- Jesse
 - Jonathan
+- JT
 - Kanat
+- Kogman
 - Kogmans
 - Kuri
 - Larry
 - Léon
+- Luehrs
 - Little
 - Littles
 - Marcel
+- Moritz
 - McLaughlin
 - Mike
 - Napiorkowski
@@ -235,9 +254,11 @@ de:
 - Rolskys
 - Schwartz
 - Shawn
+- Smith
 - Stefano
 - Stephens
 - Stevan
+- Stuart
 - sunnavys
 - Tomas
 - Treders
@@ -253,69 +274,32 @@ de:
 - Yuval
 
 ## Eigennamen
-- at
-- Advantage
 - Beijing
-- Best
-- Bioinformatics
-- BizRate
-- Capitol
 - Catalyst
-- Cisco
-- Cloudtone
-- Corporation
-- Current
-- DoctorBase
 - Doodle
-- Endeworks
+- Expanse
 - Frozen
 - Git
 - GitHub
 - Gource
-- Group
-- Hearst
 - Houston
-- IMDb
 - Infinity
 - Interactive
 - Kansai
-- Lexy
+- Lacuna
 - LinuxMag
-- Magazines
-- MedTouch
 - Melbourne
-- MusicBrainz
-- Napster
 - Nashville
 - Oasis
 - OCaml
-- Omni
 - OnLAMP
-- Open
 - Overflow
 - PerlMonks
 - Pittsburgh
-- Pobox
-- Practical
 - Ruby
-- Shadowcat
-- Shopzilla
-- SimplyClick
 - Simula
-- SocialText
-- Studios
-- Symantec
-- Takkle
-- Tamarou
 - TextMate
-- The
-- University
-- ValueClick
-- Yahoo
-# net-a-porter.com
-- com
-- net
-- porter
+- WebGUI
 
 ## Moose-spezifisch
 - Metaobjektprotokoll
@@ -360,9 +344,11 @@ de:
 ## Umgangssprache
 
 ## nicht im Wörterbuch, aber sollte drin stehen
+- Antiquierung
 - Blog
 - Blogeintrag
 - Blogeinträge
+- Datenkapselung
 - Endbericht
 - Expertenschulung
 - Gemeinschaftsprojekt