Commit a7766654a1dfdf04d45e8930f5e200f2cb500419
1 parent
1987d87d
Exists in
master
and in
29 other branches
ActionItem85: bli
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@797 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
4 changed files
with
66 additions
and
64 deletions
Show diff stats
app/models/enterprises_block.rb
| @@ -3,17 +3,16 @@ class EnterprisesBlock < Design::Block | @@ -3,17 +3,16 @@ class EnterprisesBlock < Design::Block | ||
| 3 | def content | 3 | def content |
| 4 | 4 | ||
| 5 | lambda do | 5 | lambda do |
| 6 | - content_tag( | ||
| 7 | - 'ul', | ||
| 8 | - Enterprise.find(:all).map do |p| | ||
| 9 | - content_tag( | ||
| 10 | - 'li', | ||
| 11 | - content_tag( | ||
| 12 | - 'span', | ||
| 13 | - link_to( p.name, :profile => p.identifier) | ||
| 14 | - )) | ||
| 15 | - end | 6 | + content_tag(:ul, |
| 7 | + Enterprise.find(:all).map do |p| | ||
| 8 | + content_tag(:li, | ||
| 9 | + content_tag(:span, | ||
| 10 | + link_to( p.name, :profile => p.identifier) | ||
| 16 | ) | 11 | ) |
| 12 | + ) | ||
| 13 | + end.join("\n"), | ||
| 14 | + :class => 'enterprises_list_block' | ||
| 15 | + ) | ||
| 17 | end | 16 | end |
| 18 | 17 | ||
| 19 | end | 18 | end |
app/models/list_block.rb
| @@ -12,7 +12,8 @@ class ListBlock < Design::Block | @@ -12,7 +12,8 @@ class ListBlock < Design::Block | ||
| 12 | 'span', | 12 | 'span', |
| 13 | link_to( p.name, :profile => p.identifier) | 13 | link_to( p.name, :profile => p.identifier) |
| 14 | )) | 14 | )) |
| 15 | - end | 15 | + end.join("\n"), |
| 16 | + :class => 'people_list_block' | ||
| 16 | ) | 17 | ) |
| 17 | end | 18 | end |
| 18 | 19 |
po/noosfero.pot
| @@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
| 7 | msgid "" | 7 | msgid "" |
| 8 | msgstr "" | 8 | msgstr "" |
| 9 | "Project-Id-Version: noosfero 0.3.0\n" | 9 | "Project-Id-Version: noosfero 0.3.0\n" |
| 10 | -"POT-Creation-Date: 2007-10-20 00:09-0300\n" | 10 | +"POT-Creation-Date: 2007-10-20 03:04-0300\n" |
| 11 | "PO-Revision-Date: 2007-08-30 18:47-0300\n" | 11 | "PO-Revision-Date: 2007-08-30 18:47-0300\n" |
| 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
| 13 | "Language-Team: LANGUAGE <LL@li.org>\n" | 13 | "Language-Team: LANGUAGE <LL@li.org>\n" |
| @@ -16,9 +16,13 @@ msgstr "" | @@ -16,9 +16,13 @@ msgstr "" | ||
| 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
| 17 | "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" | 17 | "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" |
| 18 | 18 | ||
| 19 | -#: app/controllers/environment_admin/edit_template_controller.rb:10 | 19 | +#: app/controllers/environment_admin/edit_template_controller.rb:7 |
| 20 | +msgid "List Block" | ||
| 21 | +msgstr "" | ||
| 22 | + | ||
| 23 | +#: app/controllers/environment_admin/edit_template_controller.rb:8 | ||
| 20 | #: app/controllers/profile_admin/profile_editor_controller.rb:14 | 24 | #: app/controllers/profile_admin/profile_editor_controller.rb:14 |
| 21 | -msgid "Main content block" | 25 | +msgid "Link Block" |
| 22 | msgstr "" | 26 | msgstr "" |
| 23 | 27 | ||
| 24 | #: app/controllers/environment_admin/manage_tags_controller.rb:26 | 28 | #: app/controllers/environment_admin/manage_tags_controller.rb:26 |
| @@ -82,11 +86,11 @@ msgstr "" | @@ -82,11 +86,11 @@ msgstr "" | ||
| 82 | msgid "Enterprise sucessfully erased from the system" | 86 | msgid "Enterprise sucessfully erased from the system" |
| 83 | msgstr "" | 87 | msgstr "" |
| 84 | 88 | ||
| 85 | -#: app/controllers/profile_admin/enterprise_editor_controller.rb:41 | 89 | +#: app/controllers/profile_admin/enterprise_editor_controller.rb:44 |
| 86 | msgid "Enterprise successfuly activacted" | 90 | msgid "Enterprise successfuly activacted" |
| 87 | msgstr "" | 91 | msgstr "" |
| 88 | 92 | ||
| 89 | -#: app/controllers/profile_admin/enterprise_editor_controller.rb:43 | 93 | +#: app/controllers/profile_admin/enterprise_editor_controller.rb:46 |
| 90 | msgid "Failed to activate the enterprise" | 94 | msgid "Failed to activate the enterprise" |
| 91 | msgstr "" | 95 | msgstr "" |
| 92 | 96 | ||
| @@ -101,45 +105,41 @@ msgid "Enterprise was not created" | @@ -101,45 +105,41 @@ msgid "Enterprise was not created" | ||
| 101 | msgstr "" | 105 | msgstr "" |
| 102 | 106 | ||
| 103 | #: app/controllers/profile_admin/profile_editor_controller.rb:12 | 107 | #: app/controllers/profile_admin/profile_editor_controller.rb:12 |
| 104 | -msgid "List Block" | 108 | +msgid "List of People" |
| 105 | msgstr "" | 109 | msgstr "" |
| 106 | 110 | ||
| 107 | #: app/controllers/profile_admin/profile_editor_controller.rb:13 | 111 | #: app/controllers/profile_admin/profile_editor_controller.rb:13 |
| 108 | -msgid "Link Block" | 112 | +msgid "List of Enterprises" |
| 109 | msgstr "" | 113 | msgstr "" |
| 110 | 114 | ||
| 111 | #: app/controllers/profile_admin/profile_editor_controller.rb:15 | 115 | #: app/controllers/profile_admin/profile_editor_controller.rb:15 |
| 112 | msgid "Recent documents block" | 116 | msgid "Recent documents block" |
| 113 | msgstr "" | 117 | msgstr "" |
| 114 | 118 | ||
| 115 | -#: app/controllers/public/account_controller.rb:21 | 119 | +#: app/controllers/public/account_controller.rb:29 |
| 116 | msgid "Logged in successfully" | 120 | msgid "Logged in successfully" |
| 117 | msgstr "" | 121 | msgstr "" |
| 118 | 122 | ||
| 119 | -#: app/controllers/public/account_controller.rb:23 | 123 | +#: app/controllers/public/account_controller.rb:31 |
| 120 | msgid "Incorrect username or password" | 124 | msgid "Incorrect username or password" |
| 121 | msgstr "" | 125 | msgstr "" |
| 122 | 126 | ||
| 123 | -#: app/controllers/public/account_controller.rb:42 | 127 | +#: app/controllers/public/account_controller.rb:50 |
| 124 | msgid "Thanks for signing up!" | 128 | msgid "Thanks for signing up!" |
| 125 | msgstr "" | 129 | msgstr "" |
| 126 | 130 | ||
| 127 | -#: app/controllers/public/account_controller.rb:54 | 131 | +#: app/controllers/public/account_controller.rb:62 |
| 128 | msgid "You have been logged out." | 132 | msgid "You have been logged out." |
| 129 | msgstr "" | 133 | msgstr "" |
| 130 | 134 | ||
| 131 | -#: app/controllers/public/account_controller.rb:65 | 135 | +#: app/controllers/public/account_controller.rb:73 |
| 132 | msgid "Your password has been changed successfully!" | 136 | msgid "Your password has been changed successfully!" |
| 133 | msgstr "" | 137 | msgstr "" |
| 134 | 138 | ||
| 135 | -#: app/controllers/public/account_controller.rb:68 | 139 | +#: app/controllers/public/account_controller.rb:76 |
| 136 | msgid "The supplied current password is incorrect." | 140 | msgid "The supplied current password is incorrect." |
| 137 | msgstr "" | 141 | msgstr "" |
| 138 | 142 | ||
| 139 | -#: app/controllers/application.rb:43 | ||
| 140 | -msgid "There is no page %s" | ||
| 141 | -msgstr "" | ||
| 142 | - | ||
| 143 | #: app/models/validation_info.rb:- | 143 | #: app/models/validation_info.rb:- |
| 144 | msgid "validation info" | 144 | msgid "validation info" |
| 145 | msgstr "" | 145 | msgstr "" |
| @@ -263,7 +263,7 @@ msgstr "" | @@ -263,7 +263,7 @@ msgstr "" | ||
| 263 | msgid "Edit profile design" | 263 | msgid "Edit profile design" |
| 264 | msgstr "" | 264 | msgstr "" |
| 265 | 265 | ||
| 266 | -#: app/models/profile.rb:63 | 266 | +#: app/models/profile.rb:64 |
| 267 | msgid "An existing profile cannot be renamed." | 267 | msgid "An existing profile cannot be renamed." |
| 268 | msgstr "" | 268 | msgstr "" |
| 269 | 269 | ||
| @@ -643,7 +643,7 @@ msgstr "" | @@ -643,7 +643,7 @@ msgstr "" | ||
| 643 | msgid "%{fn} must be the same as the parents'" | 643 | msgid "%{fn} must be the same as the parents'" |
| 644 | msgstr "" | 644 | msgstr "" |
| 645 | 645 | ||
| 646 | -#: app/models/organization.rb:11 app/models/organization.rb:16 | 646 | +#: app/models/organization.rb:15 app/models/organization.rb:20 |
| 647 | msgid "(not informed)" | 647 | msgid "(not informed)" |
| 648 | msgstr "" | 648 | msgstr "" |
| 649 | 649 | ||
| @@ -1715,18 +1715,14 @@ msgstr "" | @@ -1715,18 +1715,14 @@ msgstr "" | ||
| 1715 | msgid "My profile" | 1715 | msgid "My profile" |
| 1716 | msgstr "" | 1716 | msgstr "" |
| 1717 | 1717 | ||
| 1718 | -#: app/views/profile_editor/index.rhtml:13 | 1718 | +#: app/views/profile_editor/index.rhtml:14 |
| 1719 | msgid "Edit Visual Design" | 1719 | msgid "Edit Visual Design" |
| 1720 | msgstr "" | 1720 | msgstr "" |
| 1721 | 1721 | ||
| 1722 | -#: app/views/profile_editor/index.rhtml:15 | 1722 | +#: app/views/profile_editor/index.rhtml:16 |
| 1723 | msgid "Menage content" | 1723 | msgid "Menage content" |
| 1724 | msgstr "" | 1724 | msgstr "" |
| 1725 | 1725 | ||
| 1726 | -#: app/views/profile_editor/index.rhtml:18 | ||
| 1727 | -msgid "Edit enterprise info" | ||
| 1728 | -msgstr "" | ||
| 1729 | - | ||
| 1730 | #: app/views/enterprise_registration/basic_information.rhtml:27 | 1726 | #: app/views/enterprise_registration/basic_information.rhtml:27 |
| 1731 | msgid "Management information" | 1727 | msgid "Management information" |
| 1732 | msgstr "" | 1728 | msgstr "" |
po/pt_BR/noosfero.po
| @@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
| 9 | msgid "" | 9 | msgid "" |
| 10 | msgstr "" | 10 | msgstr "" |
| 11 | "Project-Id-Version: noosfero 0.3.0\n" | 11 | "Project-Id-Version: noosfero 0.3.0\n" |
| 12 | -"POT-Creation-Date: 2007-10-20 00:09-0300\n" | 12 | +"POT-Creation-Date: 2007-10-20 03:04-0300\n" |
| 13 | "PO-Revision-Date: 2007-10-19 21:25-0300\n" | 13 | "PO-Revision-Date: 2007-10-19 21:25-0300\n" |
| 14 | "Last-Translator: Rafael Tavares Bomfim <rafael@colivre.coop.br>\n" | 14 | "Last-Translator: Rafael Tavares Bomfim <rafael@colivre.coop.br>\n" |
| 15 | "Language-Team: \n" | 15 | "Language-Team: \n" |
| @@ -19,10 +19,14 @@ msgstr "" | @@ -19,10 +19,14 @@ msgstr "" | ||
| 19 | "Plural-Forms: nplurals=2; plural=(n > 1);\n" | 19 | "Plural-Forms: nplurals=2; plural=(n > 1);\n" |
| 20 | "X-Generator: Pootle 1.0.2\n" | 20 | "X-Generator: Pootle 1.0.2\n" |
| 21 | 21 | ||
| 22 | -#: app/controllers/environment_admin/edit_template_controller.rb:10 | 22 | +#: app/controllers/environment_admin/edit_template_controller.rb:7 |
| 23 | +msgid "List Block" | ||
| 24 | +msgstr "Bloco de Lista" | ||
| 25 | + | ||
| 26 | +#: app/controllers/environment_admin/edit_template_controller.rb:8 | ||
| 23 | #: app/controllers/profile_admin/profile_editor_controller.rb:14 | 27 | #: app/controllers/profile_admin/profile_editor_controller.rb:14 |
| 24 | -msgid "Main content block" | ||
| 25 | -msgstr "Bloco de conteúdo principal" | 28 | +msgid "Link Block" |
| 29 | +msgstr "Bloco de Link" | ||
| 26 | 30 | ||
| 27 | #: app/controllers/environment_admin/manage_tags_controller.rb:26 | 31 | #: app/controllers/environment_admin/manage_tags_controller.rb:26 |
| 28 | msgid "Tag was successfully created." | 32 | msgid "Tag was successfully created." |
| @@ -85,11 +89,11 @@ msgstr "Não pôde modificar o empreendimento" | @@ -85,11 +89,11 @@ msgstr "Não pôde modificar o empreendimento" | ||
| 85 | msgid "Enterprise sucessfully erased from the system" | 89 | msgid "Enterprise sucessfully erased from the system" |
| 86 | msgstr "Empreendimento ativado com sucesso" | 90 | msgstr "Empreendimento ativado com sucesso" |
| 87 | 91 | ||
| 88 | -#: app/controllers/profile_admin/enterprise_editor_controller.rb:41 | 92 | +#: app/controllers/profile_admin/enterprise_editor_controller.rb:44 |
| 89 | msgid "Enterprise successfuly activacted" | 93 | msgid "Enterprise successfuly activacted" |
| 90 | msgstr "Empreendimento ativado com sucesso" | 94 | msgstr "Empreendimento ativado com sucesso" |
| 91 | 95 | ||
| 92 | -#: app/controllers/profile_admin/enterprise_editor_controller.rb:43 | 96 | +#: app/controllers/profile_admin/enterprise_editor_controller.rb:46 |
| 93 | msgid "Failed to activate the enterprise" | 97 | msgid "Failed to activate the enterprise" |
| 94 | msgstr "Falhou em ativar o empreendimento" | 98 | msgstr "Falhou em ativar o empreendimento" |
| 95 | 99 | ||
| @@ -106,45 +110,42 @@ msgid "Enterprise was not created" | @@ -106,45 +110,42 @@ msgid "Enterprise was not created" | ||
| 106 | msgstr "Empreendimento não foi criado" | 110 | msgstr "Empreendimento não foi criado" |
| 107 | 111 | ||
| 108 | #: app/controllers/profile_admin/profile_editor_controller.rb:12 | 112 | #: app/controllers/profile_admin/profile_editor_controller.rb:12 |
| 109 | -msgid "List Block" | ||
| 110 | -msgstr "Bloco de Lista" | 113 | +msgid "List of People" |
| 114 | +msgstr "" | ||
| 111 | 115 | ||
| 112 | #: app/controllers/profile_admin/profile_editor_controller.rb:13 | 116 | #: app/controllers/profile_admin/profile_editor_controller.rb:13 |
| 113 | -msgid "Link Block" | ||
| 114 | -msgstr "Bloco de Link" | 117 | +#, fuzzy |
| 118 | +msgid "List of Enterprises" | ||
| 119 | +msgstr "Meus Empreendimentos" | ||
| 115 | 120 | ||
| 116 | #: app/controllers/profile_admin/profile_editor_controller.rb:15 | 121 | #: app/controllers/profile_admin/profile_editor_controller.rb:15 |
| 117 | msgid "Recent documents block" | 122 | msgid "Recent documents block" |
| 118 | msgstr "Bloco de documentos recentes" | 123 | msgstr "Bloco de documentos recentes" |
| 119 | 124 | ||
| 120 | -#: app/controllers/public/account_controller.rb:21 | 125 | +#: app/controllers/public/account_controller.rb:29 |
| 121 | msgid "Logged in successfully" | 126 | msgid "Logged in successfully" |
| 122 | msgstr "Login bem sucedido" | 127 | msgstr "Login bem sucedido" |
| 123 | 128 | ||
| 124 | -#: app/controllers/public/account_controller.rb:23 | 129 | +#: app/controllers/public/account_controller.rb:31 |
| 125 | msgid "Incorrect username or password" | 130 | msgid "Incorrect username or password" |
| 126 | msgstr "Nome ou senha incorreto" | 131 | msgstr "Nome ou senha incorreto" |
| 127 | 132 | ||
| 128 | -#: app/controllers/public/account_controller.rb:42 | 133 | +#: app/controllers/public/account_controller.rb:50 |
| 129 | msgid "Thanks for signing up!" | 134 | msgid "Thanks for signing up!" |
| 130 | msgstr "Obrigado por se registrar!" | 135 | msgstr "Obrigado por se registrar!" |
| 131 | 136 | ||
| 132 | -#: app/controllers/public/account_controller.rb:54 | 137 | +#: app/controllers/public/account_controller.rb:62 |
| 133 | msgid "You have been logged out." | 138 | msgid "You have been logged out." |
| 134 | msgstr "Você se saiu do sistema" | 139 | msgstr "Você se saiu do sistema" |
| 135 | 140 | ||
| 136 | -#: app/controllers/public/account_controller.rb:65 | 141 | +#: app/controllers/public/account_controller.rb:73 |
| 137 | msgid "Your password has been changed successfully!" | 142 | msgid "Your password has been changed successfully!" |
| 138 | msgstr "Sua senha foi alterada com sucesso!" | 143 | msgstr "Sua senha foi alterada com sucesso!" |
| 139 | 144 | ||
| 140 | -#: app/controllers/public/account_controller.rb:68 | 145 | +#: app/controllers/public/account_controller.rb:76 |
| 141 | msgid "The supplied current password is incorrect." | 146 | msgid "The supplied current password is incorrect." |
| 142 | msgstr "A senha informada está incorreta" | 147 | msgstr "A senha informada está incorreta" |
| 143 | 148 | ||
| 144 | -#: app/controllers/application.rb:43 | ||
| 145 | -msgid "There is no page %s" | ||
| 146 | -msgstr "Não há página: %s" | ||
| 147 | - | ||
| 148 | #: app/models/validation_info.rb:- | 149 | #: app/models/validation_info.rb:- |
| 149 | msgid "validation info" | 150 | msgid "validation info" |
| 150 | msgstr "informação de validação" | 151 | msgstr "informação de validação" |
| @@ -271,7 +272,7 @@ msgstr "Conteúdo da postagem" | @@ -271,7 +272,7 @@ msgstr "Conteúdo da postagem" | ||
| 271 | msgid "Edit profile design" | 272 | msgid "Edit profile design" |
| 272 | msgstr "Editar design de perfil" | 273 | msgstr "Editar design de perfil" |
| 273 | 274 | ||
| 274 | -#: app/models/profile.rb:63 | 275 | +#: app/models/profile.rb:64 |
| 275 | msgid "An existing profile cannot be renamed." | 276 | msgid "An existing profile cannot be renamed." |
| 276 | msgstr "Um perfil existente não pode ser renomeado" | 277 | msgstr "Um perfil existente não pode ser renomeado" |
| 277 | 278 | ||
| @@ -663,7 +664,7 @@ msgstr "%{fn} já foi atribuído a outra categoria." | @@ -663,7 +664,7 @@ msgstr "%{fn} já foi atribuído a outra categoria." | ||
| 663 | msgid "%{fn} must be the same as the parents'" | 664 | msgid "%{fn} must be the same as the parents'" |
| 664 | msgstr "%{fn} tem que ser o mesmo que o dos pais'" | 665 | msgstr "%{fn} tem que ser o mesmo que o dos pais'" |
| 665 | 666 | ||
| 666 | -#: app/models/organization.rb:11 app/models/organization.rb:16 | 667 | +#: app/models/organization.rb:15 app/models/organization.rb:20 |
| 667 | msgid "(not informed)" | 668 | msgid "(not informed)" |
| 668 | msgstr "(não informado)" | 669 | msgstr "(não informado)" |
| 669 | 670 | ||
| @@ -1767,18 +1768,14 @@ msgstr "Salvar" | @@ -1767,18 +1768,14 @@ msgstr "Salvar" | ||
| 1767 | msgid "My profile" | 1768 | msgid "My profile" |
| 1768 | msgstr "Meu perfil" | 1769 | msgstr "Meu perfil" |
| 1769 | 1770 | ||
| 1770 | -#: app/views/profile_editor/index.rhtml:13 | 1771 | +#: app/views/profile_editor/index.rhtml:14 |
| 1771 | msgid "Edit Visual Design" | 1772 | msgid "Edit Visual Design" |
| 1772 | msgstr "Editar Aparência" | 1773 | msgstr "Editar Aparência" |
| 1773 | 1774 | ||
| 1774 | -#: app/views/profile_editor/index.rhtml:15 | 1775 | +#: app/views/profile_editor/index.rhtml:16 |
| 1775 | msgid "Menage content" | 1776 | msgid "Menage content" |
| 1776 | msgstr "Garenciar conteúdo" | 1777 | msgstr "Garenciar conteúdo" |
| 1777 | 1778 | ||
| 1778 | -#: app/views/profile_editor/index.rhtml:18 | ||
| 1779 | -msgid "Edit enterprise info" | ||
| 1780 | -msgstr "Editar informação de empreendimento" | ||
| 1781 | - | ||
| 1782 | #: app/views/enterprise_registration/basic_information.rhtml:27 | 1779 | #: app/views/enterprise_registration/basic_information.rhtml:27 |
| 1783 | msgid "Management information" | 1780 | msgid "Management information" |
| 1784 | msgstr "Gerenciamento de informação" | 1781 | msgstr "Gerenciamento de informação" |
| @@ -1868,6 +1865,15 @@ msgstr "Editando %s" | @@ -1868,6 +1865,15 @@ msgstr "Editando %s" | ||
| 1868 | msgid "Categories" | 1865 | msgid "Categories" |
| 1869 | msgstr "Categorias" | 1866 | msgstr "Categorias" |
| 1870 | 1867 | ||
| 1868 | +#~ msgid "Main content block" | ||
| 1869 | +#~ msgstr "Bloco de conteúdo principal" | ||
| 1870 | + | ||
| 1871 | +#~ msgid "There is no page %s" | ||
| 1872 | +#~ msgstr "Não há página: %s" | ||
| 1873 | + | ||
| 1874 | +#~ msgid "Edit enterprise info" | ||
| 1875 | +#~ msgstr "Editar informação de empreendimento" | ||
| 1876 | + | ||
| 1871 | #~ msgid "Profile|Flexible template template" | 1877 | #~ msgid "Profile|Flexible template template" |
| 1872 | #~ msgstr "Modelo fexível modelo" | 1878 | #~ msgstr "Modelo fexível modelo" |
| 1873 | 1879 |