some fix for locale,new polish locale
Wojciech Todryk
parent
83088930fe
commit
7145c6486d
5
README
5
README
|
|
@ -28,4 +28,7 @@ Installation
|
|||
:password => "yourpass"
|
||||
}
|
||||
|
||||
4 Use it
|
||||
4. Prepare config/database.yml file (see config/database.yml.example)
|
||||
5. Migrate database (rake db:migrate)
|
||||
|
||||
6. Use it
|
||||
|
|
|
|||
|
|
@ -89,8 +89,16 @@ class WebmailController < ApplicationController
|
|||
@pages = Paginator.new self, 0, get_mail_prefs.wm_rows, @page
|
||||
@messages = folder.messages_search([@search_field, @search_value], sort_query + (reverse_sort ? ' desc' : ' asc'))
|
||||
else
|
||||
|
||||
logger.info "total #{folder.total}"
|
||||
logger.info "prews #{get_mail_prefs.wm_rows}"
|
||||
logger.info "@page #{@page.inspect}"
|
||||
logger.info "========================folder #{folder.messages.count}"
|
||||
|
||||
@pages = Paginator.new self, folder.total, get_mail_prefs.wm_rows, @page
|
||||
@messages = folder.messages(@pages.current.first_item - 1, get_mail_prefs.wm_rows, sort_query + (reverse_sort ? ' desc' : ' asc'))
|
||||
logger.info "========================folder after #{folder.messages.count}"
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# (Use only when you can't set environment variables through your web/app server)
|
||||
# ENV['RAILS_ENV'] = 'production'
|
||||
|
||||
RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
|
||||
#RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
|
||||
|
||||
# Bootstrap the Rails environment, frameworks, and default configuration
|
||||
require File.join(File.dirname(__FILE__), 'boot')
|
||||
|
|
@ -34,7 +34,7 @@ Rails::Initializer.run do |config|
|
|||
# Make Active Record use UTC-base instead of local time
|
||||
config.active_record.default_timezone = :utc
|
||||
|
||||
config.i18n.default_locale = "es-ES"
|
||||
#config.i18n.default_locale = "en"
|
||||
|
||||
# Use Active Record's schema dumper instead of SQL when creating the test database
|
||||
# (enables use of different database adapters for development and test environments)
|
||||
|
|
@ -65,6 +65,9 @@ rescue LoadError
|
|||
STDERR.puts 'WARNING: config/site.rb not found, using default settings from ' + default_config_path
|
||||
end
|
||||
|
||||
#if CONFIG[:locale] is nil then I18n.default_locale will be used
|
||||
I18n.default_locale = CDF::CONFIG[:locale]
|
||||
|
||||
require 'tmail_patch'
|
||||
$KCODE = 'u'
|
||||
require 'jcode'
|
||||
|
|
|
|||
|
|
@ -0,0 +1,70 @@
|
|||
pl-PL:
|
||||
mailr: Mailr
|
||||
email: E-mail
|
||||
password: Hasło
|
||||
log_in: Zaloguj
|
||||
wrong_email_or_password: Podano nieprawidłowy login lub hasło.
|
||||
mailbox: Poczta
|
||||
folders: Foldery
|
||||
folder: Folder
|
||||
empty: Pusty
|
||||
logout: Wyloguj
|
||||
compose: Nowa wiadomość
|
||||
preferences: Ustawienia
|
||||
filters: Filtry
|
||||
contacts: Kontakty
|
||||
search: Szukaj
|
||||
search_txt: Szukaj w polu wiadomości
|
||||
refresh: Odśwież
|
||||
operations: Akcje
|
||||
operations_txt: Akcje na zaznaczonych wiadomościach
|
||||
delete: Usuń
|
||||
copy: Skopiuj
|
||||
move: Przenieś
|
||||
mark_read: Zaznacz jako przeczytane
|
||||
mark_unread: Zaznacz jako nieprzeczytane
|
||||
destination_txt: Miejsce docelowe dla akcji
|
||||
for: ciągu znaków
|
||||
to: Do
|
||||
subject: Temat
|
||||
date: Data
|
||||
size: Rozmiar
|
||||
from: Od
|
||||
show_all: Pokaż wszystkie
|
||||
pages: Strony
|
||||
first: Pierwsza
|
||||
prev: Poprzednia
|
||||
next: Następna
|
||||
last: Ostatnia
|
||||
back_to_list: Powrót do listy
|
||||
back_to_message: Powrót do wiadomości
|
||||
reply: Odpowiedz
|
||||
forward: Przekaż
|
||||
delete: Usuń
|
||||
view_source: Pokaż źródło
|
||||
add_filter: Dodaj filtr
|
||||
cc: Cc
|
||||
bcc: Bcc
|
||||
send: Wyslij
|
||||
choose_address: Wybierz adres z kontaktów
|
||||
compose_txt: Utwórz nową wiadomość
|
||||
attachment: Załącznik
|
||||
add: Dodaj
|
||||
first_name: Imię
|
||||
last_name: Nazwisko
|
||||
send_type: Format wiadomości wychodzącej
|
||||
messages_per_page: Ilość wiadomości na stronie
|
||||
check_external_mail: Check external mail?
|
||||
check_external_mail_txt: Note that by selecting this option webmail system will try to log you using your original email on a local server.
|
||||
save: Zapisz
|
||||
cancel: Anuluj
|
||||
add_one_contact: Dodaj jeden kontakt
|
||||
add_multiple: Dodaj wiele
|
||||
name: Nazwa
|
||||
add_folder: Dodaj folder
|
||||
total_messages: Total messages
|
||||
unseen: Unseen
|
||||
add_edit_folder: Zarządzanie folderami
|
||||
user_logged_out: Użytkownik został wylogowany
|
||||
please_login: Logowanie
|
||||
add_to_contacts: Dodaj do kontaktów
|
||||
|
|
@ -148,7 +148,7 @@ module Mail2Screen
|
|||
end
|
||||
|
||||
def add_to_contact(addr, msg_id)
|
||||
" <a href='/contact/add_from_mail?cstr=#{CGI.escape(friendly_address(addr))}&retmsg=#{msg_id}'>Agregar a contactos</a>"
|
||||
" <a href='/contact/add_from_mail?cstr=#{CGI.escape(friendly_address(addr))}&retmsg=#{msg_id}'>"+t(:add_to_contacts)
|
||||
end
|
||||
|
||||
def short_address(addresses)
|
||||
|
|
|
|||
Loading…
Reference in New Issue