Commit 34e1099ce1ce29aa8cb318178005640f91803ebf
1 parent
92ff8438
Exists in
stable-spb-1.4
and in
3 other branches
Add title in search communities and search peoples
Showing
2 changed files
with
27 additions
and
22 deletions
Show diff stats
app/controllers/public/search_controller.rb
| @@ -71,6 +71,7 @@ class SearchController < PublicController | @@ -71,6 +71,7 @@ class SearchController < PublicController | ||
| 71 | end | 71 | end |
| 72 | 72 | ||
| 73 | def people | 73 | def people |
| 74 | + @titles[:people] = _("People Search") | ||
| 74 | @scope = visible_profiles(Person) | 75 | @scope = visible_profiles(Person) |
| 75 | full_text_search | 76 | full_text_search |
| 76 | end | 77 | end |
| @@ -86,6 +87,7 @@ class SearchController < PublicController | @@ -86,6 +87,7 @@ class SearchController < PublicController | ||
| 86 | end | 87 | end |
| 87 | 88 | ||
| 88 | def communities | 89 | def communities |
| 90 | + @titles[:community] = _("Communities Search") | ||
| 89 | @scope = visible_profiles(Community) | 91 | @scope = visible_profiles(Community) |
| 90 | full_text_search | 92 | full_text_search |
| 91 | end | 93 | end |
po/pt/noosfero.po
| @@ -11,8 +11,8 @@ | @@ -11,8 +11,8 @@ | ||
| 11 | # | 11 | # |
| 12 | msgid "" | 12 | msgid "" |
| 13 | msgstr "" | 13 | msgstr "" |
| 14 | -"Project-Id-Version: 1.3.1-61-g25bc299\n" | ||
| 15 | -"POT-Creation-Date: 2016-01-07 12:45-0000\n" | 14 | +"Project-Id-Version: 1.3.1-64-g92ff843\n" |
| 15 | +"POT-Creation-Date: 2016-01-21 17:42-0000\n" | ||
| 16 | "PO-Revision-Date: 2015-11-04 13:40-0200\n" | 16 | "PO-Revision-Date: 2015-11-04 13:40-0200\n" |
| 17 | "Last-Translator: Bráulio Bhavamitra <brauliobo@gmail.com>\n" | 17 | "Last-Translator: Bráulio Bhavamitra <brauliobo@gmail.com>\n" |
| 18 | "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/" | 18 | "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/" |
| @@ -1057,7 +1057,7 @@ msgstr "Acima Vermelho" | @@ -1057,7 +1057,7 @@ msgstr "Acima Vermelho" | ||
| 1057 | #: app/views/cms/_text_editor_sidebar.html.erb:34 | 1057 | #: app/views/cms/_text_editor_sidebar.html.erb:34 |
| 1058 | #: app/views/shared/_profile_search_form.html.erb:7 | 1058 | #: app/views/shared/_profile_search_form.html.erb:7 |
| 1059 | #: app/views/search/_sellers_form.html.erb:21 | 1059 | #: app/views/search/_sellers_form.html.erb:21 |
| 1060 | -#: app/views/search/_search_form.html.erb:19 | 1060 | +#: app/views/search/_search_form.html.erb:18 |
| 1061 | msgid "Search" | 1061 | msgid "Search" |
| 1062 | msgstr "Busca" | 1062 | msgstr "Busca" |
| 1063 | 1063 | ||
| @@ -2078,8 +2078,8 @@ msgstr "Este bloco apresenta as categorias como um menu." | @@ -2078,8 +2078,8 @@ msgstr "Este bloco apresenta as categorias como um menu." | ||
| 2078 | 2078 | ||
| 2079 | #: app/models/communities_block.rb:6 | 2079 | #: app/models/communities_block.rb:6 |
| 2080 | #: app/controllers/public/search_controller.rb:54 | 2080 | #: app/controllers/public/search_controller.rb:54 |
| 2081 | -#: app/controllers/public/search_controller.rb:183 | ||
| 2082 | -#: app/controllers/public/search_controller.rb:259 | 2081 | +#: app/controllers/public/search_controller.rb:185 |
| 2082 | +#: app/controllers/public/search_controller.rb:261 | ||
| 2083 | #: app/helpers/assets_helper.rb:11 app/helpers/application_helper.rb:564 | 2083 | #: app/helpers/assets_helper.rb:11 app/helpers/application_helper.rb:564 |
| 2084 | #: app/helpers/application_helper.rb:1128 | 2084 | #: app/helpers/application_helper.rb:1128 |
| 2085 | msgid "Communities" | 2085 | msgid "Communities" |
| @@ -2331,8 +2331,8 @@ msgstr "Este block apresenta os empreendimentos onde este usuário trabalha." | @@ -2331,8 +2331,8 @@ msgstr "Este block apresenta os empreendimentos onde este usuário trabalha." | ||
| 2331 | 2331 | ||
| 2332 | #: app/models/enterprises_block.rb:12 | 2332 | #: app/models/enterprises_block.rb:12 |
| 2333 | #: app/controllers/public/search_controller.rb:51 | 2333 | #: app/controllers/public/search_controller.rb:51 |
| 2334 | -#: app/controllers/public/search_controller.rb:184 | ||
| 2335 | -#: app/controllers/public/search_controller.rb:257 | 2334 | +#: app/controllers/public/search_controller.rb:186 |
| 2335 | +#: app/controllers/public/search_controller.rb:259 | ||
| 2336 | #: app/helpers/assets_helper.rb:10 app/views/search/_sellers_form.html.erb:7 | 2336 | #: app/helpers/assets_helper.rb:10 app/views/search/_sellers_form.html.erb:7 |
| 2337 | msgid "Enterprises" | 2337 | msgid "Enterprises" |
| 2338 | msgstr "Empreendimentos" | 2338 | msgstr "Empreendimentos" |
| @@ -2624,8 +2624,8 @@ msgid "Could not create the e-mail" | @@ -2624,8 +2624,8 @@ msgid "Could not create the e-mail" | ||
| 2624 | msgstr "Não foi possível criar o e-mail" | 2624 | msgstr "Não foi possível criar o e-mail" |
| 2625 | 2625 | ||
| 2626 | #: app/controllers/public/search_controller.rb:50 | 2626 | #: app/controllers/public/search_controller.rb:50 |
| 2627 | -#: app/controllers/public/search_controller.rb:182 | ||
| 2628 | -#: app/controllers/public/search_controller.rb:258 | 2627 | +#: app/controllers/public/search_controller.rb:184 |
| 2628 | +#: app/controllers/public/search_controller.rb:260 | ||
| 2629 | #: app/helpers/assets_helper.rb:8 app/helpers/application_helper.rb:1112 | 2629 | #: app/helpers/assets_helper.rb:8 app/helpers/application_helper.rb:1112 |
| 2630 | msgid "People" | 2630 | msgid "People" |
| 2631 | msgstr "Pessoas" | 2631 | msgstr "Pessoas" |
| @@ -2635,18 +2635,26 @@ msgid "Upcoming events" | @@ -2635,18 +2635,26 @@ msgid "Upcoming events" | ||
| 2635 | msgstr "Próximos eventos" | 2635 | msgstr "Próximos eventos" |
| 2636 | 2636 | ||
| 2637 | #: app/controllers/public/search_controller.rb:55 | 2637 | #: app/controllers/public/search_controller.rb:55 |
| 2638 | -#: app/controllers/public/search_controller.rb:181 | ||
| 2639 | -#: app/controllers/public/search_controller.rb:256 | 2638 | +#: app/controllers/public/search_controller.rb:183 |
| 2639 | +#: app/controllers/public/search_controller.rb:258 | ||
| 2640 | #: app/helpers/application_helper.rb:1096 | 2640 | #: app/helpers/application_helper.rb:1096 |
| 2641 | msgid "Contents" | 2641 | msgid "Contents" |
| 2642 | msgstr "Conteúdos" | 2642 | msgstr "Conteúdos" |
| 2643 | 2643 | ||
| 2644 | -#: app/controllers/public/search_controller.rb:185 | ||
| 2645 | -#: app/controllers/public/search_controller.rb:260 | 2644 | +#: app/controllers/public/search_controller.rb:74 |
| 2645 | +msgid "People Search" | ||
| 2646 | +msgstr "Buscar Pessoas" | ||
| 2647 | + | ||
| 2648 | +#: app/controllers/public/search_controller.rb:90 | ||
| 2649 | +msgid "Communities Search" | ||
| 2650 | +msgstr "Buscar Comunidades" | ||
| 2651 | + | ||
| 2652 | +#: app/controllers/public/search_controller.rb:187 | ||
| 2653 | +#: app/controllers/public/search_controller.rb:262 | ||
| 2646 | msgid "Products and Services" | 2654 | msgid "Products and Services" |
| 2647 | msgstr "Produtos e Serviços" | 2655 | msgstr "Produtos e Serviços" |
| 2648 | 2656 | ||
| 2649 | -#: app/controllers/public/search_controller.rb:186 | 2657 | +#: app/controllers/public/search_controller.rb:188 |
| 2650 | #: app/helpers/assets_helper.rb:12 app/views/search/events.html.erb:1 | 2658 | #: app/helpers/assets_helper.rb:12 app/views/search/events.html.erb:1 |
| 2651 | #: public/designs/themes/base/navigation.html.erb:10 | 2659 | #: public/designs/themes/base/navigation.html.erb:10 |
| 2652 | #: public/designs/themes/noosfero/navigation.html.erb:10 | 2660 | #: public/designs/themes/noosfero/navigation.html.erb:10 |
| @@ -8608,14 +8616,6 @@ msgstr "ver todos (%d)" | @@ -8608,14 +8616,6 @@ msgstr "ver todos (%d)" | ||
| 8608 | msgid "by %{author} on \"%{article}\"" | 8616 | msgid "by %{author} on \"%{article}\"" |
| 8609 | msgstr "por %{author} em \"%{article}\"" | 8617 | msgstr "por %{author} em \"%{article}\"" |
| 8610 | 8618 | ||
| 8611 | -#: app/views/search/search_page.html.erb:1 | ||
| 8612 | -#: app/views/search/communities.html.erb:1 | ||
| 8613 | -#: app/views/search/articles.html.erb:1 | ||
| 8614 | -#: app/views/search/enterprises.html.erb:1 | ||
| 8615 | -#: app/views/search/products.html.erb:1 app/views/search/people.html.erb:1 | ||
| 8616 | -msgid "Type words about the %s you're looking for" | ||
| 8617 | -msgstr "Digite palavras sobre o(a) %s que você está procurando" | ||
| 8618 | - | ||
| 8619 | #: app/views/search/_full_product.html.erb:13 | 8619 | #: app/views/search/_full_product.html.erb:13 |
| 8620 | msgid "from" | 8620 | msgid "from" |
| 8621 | msgstr "de" | 8621 | msgstr "de" |
| @@ -9984,6 +9984,9 @@ msgstr "" | @@ -9984,6 +9984,9 @@ msgstr "" | ||
| 9984 | "pela %s e licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl.html" | 9984 | "pela %s e licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl.html" |
| 9985 | "\">GNU Affero General Public License</a> versão 3 ou superior." | 9985 | "\">GNU Affero General Public License</a> versão 3 ou superior." |
| 9986 | 9986 | ||
| 9987 | +#~ msgid "Type words about the %s you're looking for" | ||
| 9988 | +#~ msgstr "Digite palavras sobre o(a) %s que você está procurando" | ||
| 9989 | + | ||
| 9987 | #~ msgid "For all community members" | 9990 | #~ msgid "For all community members" |
| 9988 | #~ msgstr "Para todos os integrantes da comunidade" | 9991 | #~ msgstr "Para todos os integrantes da comunidade" |
| 9989 | 9992 |