finish shared i18n

This commit is contained in:
wvengen 2013-02-08 19:16:06 +01:00
parent e06524ca37
commit 28c66642f5
11 changed files with 120 additions and 54 deletions

View file

@ -1,10 +1,10 @@
%table.table.table-hover %table.table.table-hover
%thead %thead
%tr %tr
%th{:style => 'width:70%'} Bestellgruppe %th{:style => 'width:70%'}= t '.ordergroup'
%th Bestellt (Menge + Toleranz) %th= t '.ordered'
%th Bekommen %th= t '.received'
%th Gesamtpreis %th= t '.price'
- for order_article in order.order_articles.ordered.all(:include => [:article, :article_price]) - for order_article in order.order_articles.ordered.all(:include => [:article, :article_price])
%thead %thead
@ -22,4 +22,4 @@
%td= number_to_currency(order_article.price.fc_price * goa.result) %td= number_to_currency(order_article.price.fc_price * goa.result)
%tr %tr
%td(colspan="4" ) %td(colspan="4" )
- reset_cycle('groups') - reset_cycle('groups')

View file

@ -1,15 +1,15 @@
%table.table.table-hover %table.table.table-hover
%thead %thead
%tr %tr
%th{:style => "width:40%"} Name %th{:style => "width:40%"}= t '.name'
%th %th
%acronym{:title => "zugeteilte Einheiten"} Menge %acronym{:title => t('.units_desc')}= t '.units'
%th %th
%acronym{:title => "Preis incl. MwSt, Pfand und Foodcoop-Aufschlag"} FC-Preis %acronym{:title => t('.fc_price_desc')}= t '.fc_price'
%th %th
%acronym{:title => "Gebindegröße"} GebGr %acronym{:title => t('.unit_quantity_desc')}= t '.unit_quantity'
%th Einheit %th= t '.unit'
%th Gesamtpreis %th= t '.price'
- for group_order in order.group_orders.all - for group_order in order.group_orders.all
%thead %thead
@ -35,4 +35,4 @@
%th= number_to_currency(total) %th= number_to_currency(total)
%tr %tr
%th(colspan="6") %th(colspan="6")
- reset_cycle("articles") - reset_cycle("articles")

View file

@ -1,25 +1,25 @@
%dl %dl
%dt Beschreibung: %dt= t('.description') + ':'
%dd=h group.description %dd=h group.description
- if group.is_a?(Ordergroup) and (@current_user.role_admin? or @current_user.role_finance?) - if group.is_a?(Ordergroup) and (@current_user.role_admin? or @current_user.role_finance?)
%dt Kontakt: %dt= t('.contact') + ':'
%dd=h group.contact %dd=h group.contact
%dt Adresse: %dt= t('.address') + ':'
%dd= link_to_gmaps group.contact_address %dd= link_to_gmaps group.contact_address
%dt Zugriff auf: %dt= t('.access') + ':'
%dd= format_roles(group) %dd= format_roles(group)
%dt Mitglieder: %dt= t('.members') + ':'
%dd %dd
- members = group.users - members = group.users
= "(#{members.size})" = "(#{members.size})"
= members.collect(&:nick).join(", ") = members.collect(&:nick).join(", ")
- if group.is_a?(Workgroup) - if group.is_a?(Workgroup)
%dt wöchentlicher Job: %dt= t('.weekly_job') + ':'
%dd %dd
- if group.weekly_task - if group.weekly_task
=h "#{group.task_name} am #{weekday(group.weekday)}" =h "#{group.task_name} am #{weekday(group.weekday)}"
- else - else
kein wöchentlicher Job definiert = t '.no_weekly_job'
- else - else
%dt Äpfel-Bestellbeschränkung %dt= t '.apple_limit'
%dd= group.ignore_apple_restriction ? 'deaktiviert' : 'aktiviert' %dd= group.ignore_apple_restriction ? t('.deactivated') : t('.activated')

View file

@ -4,7 +4,7 @@
= yield = yield
- if f.object.is_a?(Workgroup) - if f.object.is_a?(Workgroup)
%h3 Wöchentliche Jobs %h3= t '.title'
= f.input :weekly_task = f.input :weekly_task
#weekly_task_fields #weekly_task_fields
= f.input :weekday, as: :select, collection: Workgroup.weekdays = f.input :weekday, as: :select, collection: Workgroup.weekdays
@ -38,9 +38,9 @@
$("##{f.object.class.to_s.underscore}_user_tokens").tokenInput("#{users_path(:format => :json)}", { $("##{f.object.class.to_s.underscore}_user_tokens").tokenInput("#{users_path(:format => :json)}", {
crossDomain: false, crossDomain: false,
prePopulate: $("##{f.object.class.to_s.underscore}_user_tokens").data("pre"), prePopulate: $("##{f.object.class.to_s.underscore}_user_tokens").data("pre"),
hintText: 'Nach Nutzerin suchen', hintText: #{t('.search_user')},
noResultText: 'Keine Nutzerin gefunden', noResultText: #{t('.user_not_found')}
searchingText: 'Suche ...', searchingText: #{t('.search')},
theme: 'facebook' theme: 'facebook'
}); });
}); });

View file

@ -1,9 +1,9 @@
%ul %ul
%li %li
= image_tag 'b_user.png' , :size => '7x10', :border => 0, :alt => "Profil" = image_tag 'b_user.png' , :size => '7x10', :border => 0, :alt => t('.profile')
= link_to h(@current_user.nick), my_profile_path, { :title => "Profil bearbeiten" } = link_to h(@current_user.nick), my_profile_path, { :title => t('.edit_profile') }
- if FoodsoftConfig[:homepage] - if FoodsoftConfig[:homepage]
%li= link_to FoodsoftConfig[:name], FoodsoftConfig[:homepage], { :title => "Go to your FoodCoop-Hompage" } %li= link_to FoodsoftConfig[:name], FoodsoftConfig[:homepage], { :title => t('.homepage_title') }
%li= link_to "Hilfe", 'http://dev.foodcoops.net/wiki/FoodsoftDoku' %li= link_to t('.help'), FoodsoftConfig[:help_url]
%li= link_to "Feedback", new_feedback_path, :title => "Fehler gefunden? Vorschlag? Idee? Kritik?" %li= link_to t('.feedback.title'), new_feedback_path, :title => t('.feedback.desc')
%li= link_to "Abmelden", logout_path %li= link_to t('.logout'), logout_path

View file

@ -1,15 +1,16 @@
%section %section
%h2 Laufende Bestellungen %h2= t '.title'
- if ordergroup.not_enough_apples? - if ordergroup.not_enough_apples?
.alert Achtung, Deine Bestellgruppe hat zu wenig Äpfel um Bestellen zu können! .alert
= t '.not_enough_apples'
- unless Order.open.empty? - unless Order.open.empty?
%table.table.table-striped %table.table.table-striped
%thead %thead
%tr %tr
%th Lieferantin %th= t '.supplier'
%th Ende %th= t '.ending'
%th Wer hat bestellt? %th= t '.who_ordered'
%th Summe %th= t '.total'
%tbody %tbody
- total = 0 - total = 0
- Order.open.each do |order| - Order.open.each do |order|
@ -26,7 +27,7 @@
%tfooter %tfooter
%tr %tr
%th(colspan="2") %th(colspan="2")
%th Gesamtsumme: %th= t('.total_sum') + ':'
%th.numeric= number_to_currency(total) %th.numeric= number_to_currency(total)
- else - else
%i Derzeit gibt es keine laufenden Bestellungen %i= t '.no_open_orders'

View file

@ -1,5 +1,5 @@
.well.well-small .well.well-small
%h4 Mitglieder der Gruppen %h4= t '.title'
#groupMembers.accordion #groupMembers.accordion
- Workgroup.all.each do |workgroup| - Workgroup.all.each do |workgroup|
.accordion-group .accordion-group
@ -11,4 +11,4 @@
- workgroup.users.includes(:groups).order('nick').each do |user| - workgroup.users.includes(:groups).order('nick').each do |user|
%li %li
= user.nick = user.nick
%small (#{user.ordergroup.try(:name)}) %small (#{user.ordergroup.try(:name)})

View file

@ -9,7 +9,7 @@
<% for membership in memberships %> <% for membership in memberships %>
<li style="margin-left:-15px"> <li style="margin-left:-15px">
<b><%= membership.user.nick %></b> (<%=h membership.user.first_name + ' ' + membership.user.last_name %>) <b><%= membership.user.nick %></b> (<%=h membership.user.first_name + ' ' + membership.user.last_name %>)
| <%= link_to_remote 'entfernen', | <%= link_to_remote t('.drop'),
:url => { :controller => '/memberships', :action => 'drop_member', :id => @group, :membership_id => membership }, :url => { :controller => '/memberships', :action => 'drop_member', :id => @group, :membership_id => membership },
:before => "Element.show('loader')", :before => "Element.show('loader')",
:success => "Element.hide('loader')" %> :success => "Element.hide('loader')" %>
@ -17,5 +17,5 @@
<% end %> <% end %>
</ul> </ul>
<% else %> <% else %>
<p><i><%= @group.name %> hat keine Mitglieder.</i></p> <p><i><%= t('.no_members', group: @group.name) %></i></p>
<% end %> <% end %>

View file

@ -1,13 +1,10 @@
<h1>Mitglieder von <%=h @group.name %></h1> <h1><%=h t('.title', group: @group.name) %></h1>
<p> <p>
<i> <i><%= t('.desc', link: remote_link_to(t('.invite'), :url => new_invite_path(:id => @group))).html_safe %></i>
Hier kannst Du die Mitglieder der Gruppe verwalten oder ein neues Foodcoop-Mitglied in die Gruppe
<%= remote_link_to('einladen', :url => new_invite_path(:id => @group)) %>.
</i>
</p> </p>
<div class="left_column" style="width:48%"> <div class="left_column" style="width:48%">
<div class="box_title"> <div class="box_title">
<h2>Sind schon Mitglieder</h2> <h2><%= t('.already_members') %></h2>
</div> </div>
<div class="column_content" id="members"> <div class="column_content" id="members">
<%=render :partial => 'shared/memberships/current_members' %> <%=render :partial => 'shared/memberships/current_members' %>
@ -15,11 +12,11 @@
</div> </div>
<div class="right_column" style="width:48%"> <div class="right_column" style="width:48%">
<div class="box_title"> <div class="box_title">
<h2>Sind noch keine Mitglieder</h2> <h2><%= t('.no_members_yet') %></h2>
</div> </div>
<div class="column_content" id="non_members"> <div class="column_content" id="non_members">
<%= render :partial => 'shared/memberships/non_members' %> <%= render :partial => 'shared/memberships/non_members' %>
<%= remote_link_to('Person einladen', :url => new_invite_path(:id => @group)) %> <%= remote_link_to(t('.invite_someone'), :url => new_invite_path(:id => @group)) %>
</div> </div>
</div> </div>

View file

@ -2,10 +2,10 @@
<% for user in @group.non_members %> <% for user in @group.non_members %>
<li> <li>
<b><%= user.nick %></b> (<%=h user.first_name + ' ' + user.last_name %>) <b><%= user.nick %></b> (<%=h user.first_name + ' ' + user.last_name %>)
| <%= link_to_remote 'hinzufügen', | <%= link_to_remote t('.add'),
:url => { :controller => '/memberships', :action => 'add_member', :id => @group, :user_id => user }, :url => { :controller => '/memberships', :action => 'add_member', :id => @group, :user_id => user },
:before => "Element.show('loader')", :before => "Element.show('loader')",
:success => "Element.hide('loader')" %> :success => "Element.hide('loader')" %>
</li> </li>
<% end %> <% end %>
</ul> </ul>

View file

@ -0,0 +1,68 @@
de:
shared:
articles_by_articles:
ordergroup: 'Bestellgruppe'
ordered: 'Bestellt (Menge + Toleranz)'
received: 'Bekommen'
price: 'Gesamtpreis'
articles_by_groups:
name: 'Name'
units: 'Menge'
units_desc: 'Zugeteilte Einheiten'
fc_price: 'FC-Preis'
fc_price_desc: 'Preis incl. MwSt, Pfand und Foodcoop-Aufschlag'
unit_quantity: 'GebGr'
unit_quantity_desc: 'Gebindegröße'
unit: 'Einheit'
price: 'Gesamtpreis'
group_form_fields:
title: 'Wöchentliche Jobs'
search_user: 'Nach Nutzerin suchen'
user_not_found: 'Keine Nutzerin gefunden'
search: 'Suche ...'
group:
description: 'Beschreibung'
contact: 'Kontakt'
address: 'Adresse'
access: 'Zugriff auf'
members: 'Mitglieder'
weekly_job: 'wöchentlicher Job'
no_weekly_job: 'kein wöchentlicher Job definiert'
apple_limit: 'Äpfel-Bestellbeschränkung'
deactivated: 'deaktiviert'
activated: 'aktiviert'
loginInfo:
profile: 'Profil'
edit_profile: 'Profil bearbeiten'
homepage_title: 'Foodcoop Homepage besuchen'
# duplicate from de.layouts.header
logout: 'Abmelden'
help: 'Hilfe'
feedback:
title: 'Feedback'
desc: 'Fehler gefunden? Vorschlag? Idee? Kritik?'
open_orders:
title: 'Laufende Bestellungen'
not_enough_apples: 'Achtung, Deine Bestellgruppe hat zu wenig Äpfel um Bestellen zu können!'
supplier: 'Lieferantin'
ending: 'Ende'
who_ordered: 'Wer hat bestellt?'
total: 'Summe'
total_sum: 'Gesamtsumme'
no_open_orders: 'Derzeit gibt es keine laufenden Bestellungen'
workgroup_members:
title: 'Mitglieder der Gruppen'
memberships:
current_members:
drop: 'entfernen'
no_members: '%{group} hat keine Mitglieder.'
members:
title: 'Mitglieder von %{group}'
desc: 'Hier kannst Du Mitglieder der Gruppe verwalten oder ein neues Foodcoop-Mitglied in die Gruppe %{link}.'
invite: 'einladen'
already_members: 'Sind schon Mitglieder'
no_members_yet: 'Sind noch keine Mitglieder'
invite_someone: 'Person einladen'
non_members:
add: 'hinzufügen'