Skip to content
This repository was archived by the owner on Jan 9, 2024. It is now read-only.

Commit ccccfee

Browse files
committed
Add about text. Fixes #12
1 parent 43cb91b commit ccccfee

File tree

3 files changed

+31
-6
lines changed

3 files changed

+31
-6
lines changed

app/views/about/show.html.erb

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
<h1><%=t '.title', :default => 'About' %></h1>
33
</div>
44

5+
<h3><%=t '.who_heading', :default => 'Who are we?' %></h3>
6+
<p><%=t '.who_content', :default => '' %></p>
7+
8+
<h3><%=t '.what_heading', :default => 'What do we want?' %></h3>
9+
<p><%=t '.what_content', :default => '' %></p>
10+
11+
<h3><%=t '.bp_heading', :default => 'What is BluePanel?' %></h3>
12+
<p><%=t '.bp_content', :default => '' %></p>
13+
14+
<h2><%=t '.contact', :default => 'Contact' %></h2>
15+
<p>Mail: <%= mail_to '[email protected]', 'info[AT]bluepanel[DOT].org' %>
16+
<p>IRC: <%= link_to '#bluepanel', 'irc://irc.freenode.net/#bluepanel' %></p>
17+
518
<div class="adminList">
619
<h3><%=t '.admins', :default => 'Administrators' %></h3>
720
<% @admins.each do |admin| %>
@@ -28,7 +41,3 @@
2841
</div>
2942
<% end %>
3043
</div>
31-
32-
<h2><%=t '.contact', :default => 'Contact' %></h2>
33-
<p>Mail: <%= mail_to '[email protected]', 'info[AT]bluepanel[DOT].org' %>
34-
<p>IRC: <%= link_to '#bluepanel', 'irc://irc.freenode.net/#bluepanel' %></p>

config/locales/de.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,15 @@ de:
9898
about:
9999
show:
100100
title: "Über uns"
101+
who_heading: "Wer sind wir?"
102+
who_content: "Wir sind ein Zusammenschluss von Freunden, die Informatik studieren und schon seit längerem Freie- und Open-Source-Software nutzen und entwickeln."
103+
what_heading: "Was wollen wir?"
104+
what_content: "Wir wollen Freie- und Open-Source-Software unterstützen, verbessern und entwickeln.
105+
Wir finden Software sollte wie Wissen frei zugänglich sein, so wie es das Zitat „Das Wissen der Menschheit gehört der Welt“ aus dem Film „Startup“ passend beschreibt.
106+
Mit BluePanel wollen wir unseren Beitrag zur aktuellen und auch zukünftigen Entwicklung von Freier- und Open-Source-Software leisten."
107+
bp_heading: "Was ist BluePanel?"
108+
bp_content: "BluePanel ist eine Plattform für Artikel und Projekte über Freie- und Open-Source-Software. Wir werden auf BluePanel unsere gemeinsamen, aber auch individuelle Projekte unserer Mitglieder veröffentlichen."
109+
contact: "Kontakt"
101110
admins: "Administratoren"
102111
global_mods: "Globale Moderatoren"
103112
developers: "Entwickler"
104-
contact: "Kontakt"

config/locales/en.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,15 @@ en:
9595
about:
9696
show:
9797
title: "About"
98+
who_heading: "Who are we?"
99+
who_content: "We are an association of friends which are studying computer science and are using and developing free and open source software for a long time."
100+
what_heading: "What do we want?"
101+
what_content: "We want to support, enhance and develop free and open source software.
102+
We think software should be freely avialable like knowledge, because “Human knowledge belongs to the world.“ (Extracted from movie 'Antitrust').
103+
With BluePanel we want to make our contribution to current and future development of free and open source software."
104+
bp_heading: "What is BluePanel?"
105+
bp_content: "BluePanel is a platform for articles and projects about free and open source software. We will publish our collabarative but also individual projects of our members on BluePanel."
106+
contact: "Contact"
98107
admins: "Administrators"
99108
global_mods: "Global Moderators"
100109
developers: "Developers"
101-
contact: "Contact"

0 commit comments

Comments
 (0)