Download as
Browse Code »

Commit 99342898f7420491758acbec3b6ee311c04c98d4

Authored by MoisesMachado
1 parent 79e66e9a
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem314: fixed link "all members" to "view all" and PT_br translation from… 

… "membros" to "integrantes"


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1685 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 5 changed files with 193 additions and 122 deletions   Show diff stats
app/models/members_block.rb
  Diff comments   View file @9934289
... ... @@ -11,7 +11,7 @@ class MembersBlock < ProfileListBlock
11 11 def footer
12 12 profile = self.owner
13 13 lambda do
14   - link_to _('All members'), :profile => profile.identifier, :controller => 'profile', :action => 'members'
  14 + link_to _('View all'), :profile => profile.identifier, :controller => 'profile', :action => 'members'
15 15 end
16 16 end
17 17  
... ...
po/fr/noosfero.po
  Diff comments   View file @9934289
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.9.0\n"
10   -"POT-Creation-Date: 2008-04-17 11:27-0300\n"
  10 +"POT-Creation-Date: 2008-04-24 12:10-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -93,7 +93,7 @@ msgstr &quot;&quot;
93 93 msgid "Could not update the product"
94 94 msgstr ""
95 95  
96   -#: app/controllers/my_profile/cms_controller.rb:87
  96 +#: app/controllers/my_profile/cms_controller.rb:90
97 97 msgid "Article \"%s\" configured as home page."
98 98 msgstr ""
99 99  
... ... @@ -197,6 +197,14 @@ msgstr &quot;&quot;
197 197 msgid "Product|Image"
198 198 msgstr ""
199 199  
  200 +#: app/models/product.rb:-
  201 +msgid "Product|Created at"
  202 +msgstr ""
  203 +
  204 +#: app/models/product.rb:-
  205 +msgid "Product|Updated at"
  206 +msgstr ""
  207 +
200 208 #: app/models/product.rb:32 app/helpers/application_helper.rb:310
201 209 msgid "Uncategorized product"
202 210 msgstr ""
... ... @@ -339,11 +347,11 @@ msgid &quot;Article|Profile&quot;
339 347 msgstr ""
340 348  
341 349 #: app/models/profile.rb:-
342   -msgid "Article|Updated on"
  350 +msgid "Article|Updated at"
343 351 msgstr ""
344 352  
345 353 #: app/models/profile.rb:-
346   -msgid "Article|Created on"
  354 +msgid "Article|Created at"
347 355 msgstr ""
348 356  
349 357 #: app/models/profile.rb:-
... ... @@ -387,6 +395,10 @@ msgid &quot;Article|Comments count&quot;
387 395 msgstr ""
388 396  
389 397 #: app/models/profile.rb:-
  398 +msgid "Article|Advertise"
  399 +msgstr ""
  400 +
  401 +#: app/models/profile.rb:-
390 402 msgid "profile"
391 403 msgstr ""
392 404  
... ... @@ -591,6 +603,7 @@ msgid &quot;Clicking on the people or groups will take you to their home page.&quot;
591 603 msgstr ""
592 604  
593 605 #: app/models/profile_list_block.rb:69
  606 +#: app/views/search/_display_results.rhtml:24
594 607 msgid "None"
595 608 msgstr ""
596 609  
... ... @@ -1106,7 +1119,7 @@ msgstr &quot;&quot;
1106 1119 msgid "List of recent content"
1107 1120 msgstr ""
1108 1121  
1109   -#: app/models/recent_documents_block.rb:20
  1122 +#: app/models/recent_documents_block.rb:15
1110 1123 msgid "Recent content"
1111 1124 msgstr ""
1112 1125  
... ... @@ -1120,23 +1133,23 @@ msgstr &quot;&quot;
1120 1133 msgid "Tag list"
1121 1134 msgstr ""
1122 1135  
1123   -#: app/models/article.rb:71
  1136 +#: app/models/article.rb:75
1124 1137 msgid "HTML Text document"
1125 1138 msgstr ""
1126 1139  
1127   -#: app/models/article.rb:80
  1140 +#: app/models/article.rb:84
1128 1141 msgid "Article"
1129 1142 msgstr ""
1130 1143  
1131   -#: app/models/article.rb:82
  1144 +#: app/models/article.rb:86
1132 1145 msgid "\"%s\" article"
1133 1146 msgstr ""
1134 1147  
1135   -#: app/models/article.rb:88
  1148 +#: app/models/article.rb:92
1136 1149 msgid "An ordinary article"
1137 1150 msgstr ""
1138 1151  
1139   -#: app/models/article.rb:90
  1152 +#: app/models/article.rb:94
1140 1153 msgid "An article of type \"%s\""
1141 1154 msgstr ""
1142 1155  
... ... @@ -1237,26 +1250,26 @@ msgid &quot;Comment|Email&quot;
1237 1250 msgstr ""
1238 1251  
1239 1252 #: app/models/comment.rb:-
1240   -msgid "Comment|Created on"
  1253 +msgid "Comment|Created at"
1241 1254 msgstr ""
1242 1255  
1243   -#: app/models/comment.rb:17
  1256 +#: app/models/comment.rb:18
1244 1257 msgid "%{fn} can only be informed for unauthenticated authors"
1245 1258 msgstr ""
1246 1259  
1247   -#: app/models/rss_feed.rb:71
  1260 +#: app/models/rss_feed.rb:77
1248 1261 msgid "%s's RSS feed"
1249 1262 msgstr ""
1250 1263  
1251   -#: app/models/rss_feed.rb:73
  1264 +#: app/models/rss_feed.rb:79
1252 1265 msgid "%s's content published at %s"
1253 1266 msgstr ""
1254 1267  
1255   -#: app/models/rss_feed.rb:99
  1268 +#: app/models/rss_feed.rb:105
1256 1269 msgid "RSS Feed"
1257 1270 msgstr ""
1258 1271  
1259   -#: app/models/rss_feed.rb:103
  1272 +#: app/models/rss_feed.rb:109
1260 1273 msgid "Provides a news feed of your more recent articles."
1261 1274 msgstr ""
1262 1275  
... ... @@ -1301,7 +1314,7 @@ msgid &quot;Members&quot;
1301 1314 msgstr ""
1302 1315  
1303 1316 #: app/models/members_block.rb:14
1304   -msgid "All members"
  1317 +msgid "View all"
1305 1318 msgstr ""
1306 1319  
1307 1320 #: app/models/category.rb:-
... ... @@ -1484,7 +1497,7 @@ msgid &quot;Help&quot;
1484 1497 msgstr ""
1485 1498  
1486 1499 #: app/helpers/application_helper.rb:77
1487   -#: app/views/box_organizer/add_block.rhtml:18 app/views/search/popup.rhtml:38
  1500 +#: app/views/box_organizer/add_block.rhtml:18 app/views/search/popup.rhtml:45
1488 1501 msgid "Close"
1489 1502 msgstr ""
1490 1503  
... ... @@ -1505,19 +1518,19 @@ msgstr &quot;&quot;
1505 1518 msgid "No product"
1506 1519 msgstr ""
1507 1520  
1508   -#: app/helpers/application_helper.rb:399
  1521 +#: app/helpers/application_helper.rb:401
1509 1522 msgid "Click on this icon to go to the <b>%s</b>'s home page"
1510 1523 msgstr ""
1511 1524  
1512   -#: app/helpers/application_helper.rb:414
  1525 +#: app/helpers/application_helper.rb:416
1513 1526 msgid "%d %B %Y"
1514 1527 msgstr ""
1515 1528  
1516   -#: app/helpers/application_helper.rb:423
  1529 +#: app/helpers/application_helper.rb:425
1517 1530 msgid "%d %B %Y, %H:%m"
1518 1531 msgstr ""
1519 1532  
1520   -#: app/helpers/application_helper.rb:454
  1533 +#: app/helpers/application_helper.rb:456
1521 1534 #: app/views/content_viewer/view_page.rhtml:55
1522 1535 #: app/views/categories/index.rhtml:1
1523 1536 msgid "Categories"
... ... @@ -1650,8 +1663,8 @@ msgstr &quot;&quot;
1650 1663  
1651 1664 #: app/views/home/index.rhtml:6 app/views/home/index.rhtml:12
1652 1665 #: app/views/region_validators/region.rhtml:23
1653   -#: app/views/layouts/application.rhtml:103 app/views/search/popup.rhtml:7
1654   -#: app/views/search/popup.rhtml:37
  1666 +#: app/views/layouts/application.rhtml:103 app/views/search/popup.rhtml:12
  1667 +#: app/views/search/popup.rhtml:44
1655 1668 msgid "Search"
1656 1669 msgstr ""
1657 1670  
... ... @@ -2740,7 +2753,7 @@ msgstr &quot;&quot;
2740 2753 msgid "%{asset_name} in %{category}"
2741 2754 msgstr ""
2742 2755  
2743   -#: app/views/search/category_index.rhtml:7 app/views/search/_product.rhtml:14
  2756 +#: app/views/search/category_index.rhtml:7 app/views/search/_product.rhtml:15
2744 2757 msgid "Category: %s"
2745 2758 msgstr ""
2746 2759  
... ... @@ -2748,23 +2761,23 @@ msgstr &quot;&quot;
2748 2761 msgid "Sub-categories"
2749 2762 msgstr ""
2750 2763  
2751   -#: app/views/search/category_index.rhtml:17
  2764 +#: app/views/search/category_index.rhtml:16
2752 2765 msgid "No sub-categories"
2753 2766 msgstr ""
2754 2767  
2755   -#: app/views/search/_category.rhtml:1 app/views/search/_region.rhtml:1
  2768 +#: app/views/search/_category.rhtml:3 app/views/search/_region.rhtml:3
2756 2769 msgid "Recent articles"
2757 2770 msgstr ""
2758 2771  
2759   -#: app/views/search/_category.rhtml:6 app/views/search/_region.rhtml:6
  2772 +#: app/views/search/_category.rhtml:14 app/views/search/_region.rhtml:14
2760 2773 msgid "Recent Comments"
2761 2774 msgstr ""
2762 2775  
2763   -#: app/views/search/_category.rhtml:12 app/views/search/_region.rhtml:12
  2776 +#: app/views/search/_category.rhtml:33 app/views/search/_region.rhtml:33
2764 2777 msgid "by %{author} on \"%{article}\""
2765 2778 msgstr ""
2766 2779  
2767   -#: app/views/search/_category.rhtml:21 app/views/search/_region.rhtml:21
  2780 +#: app/views/search/_category.rhtml:45 app/views/search/_region.rhtml:45
2768 2781 msgid "Most commented articles"
2769 2782 msgstr ""
2770 2783  
... ... @@ -2795,7 +2808,7 @@ msgid &quot;Products under this category:&quot;
2795 2808 msgstr ""
2796 2809  
2797 2810 #: app/views/search/_product_category.rhtml:15
2798   -#: app/views/search/_product.rhtml:10
  2811 +#: app/views/search/_product.rhtml:11
2799 2812 msgid "Price: %d"
2800 2813 msgstr ""
2801 2814  
... ... @@ -2807,7 +2820,7 @@ msgstr &quot;&quot;
2807 2820 msgid "Users that consumes products in this category:"
2808 2821 msgstr ""
2809 2822  
2810   -#: app/views/search/_product.rhtml:12
  2823 +#: app/views/search/_product.rhtml:13
2811 2824 msgid "Suplier: %s"
2812 2825 msgstr ""
2813 2826  
... ... @@ -2819,23 +2832,23 @@ msgstr &quot;&quot;
2819 2832 msgid "Last update: %s."
2820 2833 msgstr ""
2821 2834  
2822   -#: app/views/search/popup.rhtml:1
  2835 +#: app/views/search/popup.rhtml:3
2823 2836 msgid "Search %s"
2824 2837 msgstr ""
2825 2838  
2826   -#: app/views/search/popup.rhtml:11
  2839 +#: app/views/search/popup.rhtml:16
2827 2840 msgid "Search in:"
2828 2841 msgstr ""
2829 2842  
2830   -#: app/views/search/popup.rhtml:15
  2843 +#: app/views/search/popup.rhtml:20
2831 2844 msgid "Only in %{category}"
2832 2845 msgstr ""
2833 2846  
2834   -#: app/views/search/popup.rhtml:19
  2847 +#: app/views/search/popup.rhtml:24
2835 2848 msgid "Whole site"
2836 2849 msgstr ""
2837 2850  
2838   -#: app/views/search/popup.rhtml:24
  2851 +#: app/views/search/popup.rhtml:30
2839 2852 msgid "Search for:"
2840 2853 msgstr ""
2841 2854  
... ...
po/noosfero.pot
  Diff comments   View file @9934289
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.9.0\n"
10   -"POT-Creation-Date: 2008-04-17 11:27-0300\n"
  10 +"POT-Creation-Date: 2008-04-24 12:10-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -93,7 +93,7 @@ msgstr &quot;&quot;
93 93 msgid "Could not update the product"
94 94 msgstr ""
95 95  
96   -#: app/controllers/my_profile/cms_controller.rb:87
  96 +#: app/controllers/my_profile/cms_controller.rb:90
97 97 msgid "Article \"%s\" configured as home page."
98 98 msgstr ""
99 99  
... ... @@ -197,6 +197,14 @@ msgstr &quot;&quot;
197 197 msgid "Product|Image"
198 198 msgstr ""
199 199  
  200 +#: app/models/product.rb:-
  201 +msgid "Product|Created at"
  202 +msgstr ""
  203 +
  204 +#: app/models/product.rb:-
  205 +msgid "Product|Updated at"
  206 +msgstr ""
  207 +
200 208 #: app/models/product.rb:32 app/helpers/application_helper.rb:310
201 209 msgid "Uncategorized product"
202 210 msgstr ""
... ... @@ -339,11 +347,11 @@ msgid &quot;Article|Profile&quot;
339 347 msgstr ""
340 348  
341 349 #: app/models/profile.rb:-
342   -msgid "Article|Updated on"
  350 +msgid "Article|Updated at"
343 351 msgstr ""
344 352  
345 353 #: app/models/profile.rb:-
346   -msgid "Article|Created on"
  354 +msgid "Article|Created at"
347 355 msgstr ""
348 356  
349 357 #: app/models/profile.rb:-
... ... @@ -387,6 +395,10 @@ msgid &quot;Article|Comments count&quot;
387 395 msgstr ""
388 396  
389 397 #: app/models/profile.rb:-
  398 +msgid "Article|Advertise"
  399 +msgstr ""
  400 +
  401 +#: app/models/profile.rb:-
390 402 msgid "profile"
391 403 msgstr ""
392 404  
... ... @@ -591,6 +603,7 @@ msgid &quot;Clicking on the people or groups will take you to their home page.&quot;
591 603 msgstr ""
592 604  
593 605 #: app/models/profile_list_block.rb:69
  606 +#: app/views/search/_display_results.rhtml:24
594 607 msgid "None"
595 608 msgstr ""
596 609  
... ... @@ -1106,7 +1119,7 @@ msgstr &quot;&quot;
1106 1119 msgid "List of recent content"
1107 1120 msgstr ""
1108 1121  
1109   -#: app/models/recent_documents_block.rb:20
  1122 +#: app/models/recent_documents_block.rb:15
1110 1123 msgid "Recent content"
1111 1124 msgstr ""
1112 1125  
... ... @@ -1120,23 +1133,23 @@ msgstr &quot;&quot;
1120 1133 msgid "Tag list"
1121 1134 msgstr ""
1122 1135  
1123   -#: app/models/article.rb:71
  1136 +#: app/models/article.rb:75
1124 1137 msgid "HTML Text document"
1125 1138 msgstr ""
1126 1139  
1127   -#: app/models/article.rb:80
  1140 +#: app/models/article.rb:84
1128 1141 msgid "Article"
1129 1142 msgstr ""
1130 1143  
1131   -#: app/models/article.rb:82
  1144 +#: app/models/article.rb:86
1132 1145 msgid "\"%s\" article"
1133 1146 msgstr ""
1134 1147  
1135   -#: app/models/article.rb:88
  1148 +#: app/models/article.rb:92
1136 1149 msgid "An ordinary article"
1137 1150 msgstr ""
1138 1151  
1139   -#: app/models/article.rb:90
  1152 +#: app/models/article.rb:94
1140 1153 msgid "An article of type \"%s\""
1141 1154 msgstr ""
1142 1155  
... ... @@ -1237,26 +1250,26 @@ msgid &quot;Comment|Email&quot;
1237 1250 msgstr ""
1238 1251  
1239 1252 #: app/models/comment.rb:-
1240   -msgid "Comment|Created on"
  1253 +msgid "Comment|Created at"
1241 1254 msgstr ""
1242 1255  
1243   -#: app/models/comment.rb:17
  1256 +#: app/models/comment.rb:18
1244 1257 msgid "%{fn} can only be informed for unauthenticated authors"
1245 1258 msgstr ""
1246 1259  
1247   -#: app/models/rss_feed.rb:71
  1260 +#: app/models/rss_feed.rb:77
1248 1261 msgid "%s's RSS feed"
1249 1262 msgstr ""
1250 1263  
1251   -#: app/models/rss_feed.rb:73
  1264 +#: app/models/rss_feed.rb:79
1252 1265 msgid "%s's content published at %s"
1253 1266 msgstr ""
1254 1267  
1255   -#: app/models/rss_feed.rb:99
  1268 +#: app/models/rss_feed.rb:105
1256 1269 msgid "RSS Feed"
1257 1270 msgstr ""
1258 1271  
1259   -#: app/models/rss_feed.rb:103
  1272 +#: app/models/rss_feed.rb:109
1260 1273 msgid "Provides a news feed of your more recent articles."
1261 1274 msgstr ""
1262 1275  
... ... @@ -1301,7 +1314,7 @@ msgid &quot;Members&quot;
1301 1314 msgstr ""
1302 1315  
1303 1316 #: app/models/members_block.rb:14
1304   -msgid "All members"
  1317 +msgid "View all"
1305 1318 msgstr ""
1306 1319  
1307 1320 #: app/models/category.rb:-
... ... @@ -1484,7 +1497,7 @@ msgid &quot;Help&quot;
1484 1497 msgstr ""
1485 1498  
1486 1499 #: app/helpers/application_helper.rb:77
1487   -#: app/views/box_organizer/add_block.rhtml:18 app/views/search/popup.rhtml:38
  1500 +#: app/views/box_organizer/add_block.rhtml:18 app/views/search/popup.rhtml:45
1488 1501 msgid "Close"
1489 1502 msgstr ""
1490 1503  
... ... @@ -1505,19 +1518,19 @@ msgstr &quot;&quot;
1505 1518 msgid "No product"
1506 1519 msgstr ""
1507 1520  
1508   -#: app/helpers/application_helper.rb:399
  1521 +#: app/helpers/application_helper.rb:401
1509 1522 msgid "Click on this icon to go to the <b>%s</b>'s home page"
1510 1523 msgstr ""
1511 1524  
1512   -#: app/helpers/application_helper.rb:414
  1525 +#: app/helpers/application_helper.rb:416
1513 1526 msgid "%d %B %Y"
1514 1527 msgstr ""
1515 1528  
1516   -#: app/helpers/application_helper.rb:423
  1529 +#: app/helpers/application_helper.rb:425
1517 1530 msgid "%d %B %Y, %H:%m"
1518 1531 msgstr ""
1519 1532  
1520   -#: app/helpers/application_helper.rb:454
  1533 +#: app/helpers/application_helper.rb:456
1521 1534 #: app/views/content_viewer/view_page.rhtml:55
1522 1535 #: app/views/categories/index.rhtml:1
1523 1536 msgid "Categories"
... ... @@ -1650,8 +1663,8 @@ msgstr &quot;&quot;
1650 1663  
1651 1664 #: app/views/home/index.rhtml:6 app/views/home/index.rhtml:12
1652 1665 #: app/views/region_validators/region.rhtml:23
1653   -#: app/views/layouts/application.rhtml:103 app/views/search/popup.rhtml:7
1654   -#: app/views/search/popup.rhtml:37
  1666 +#: app/views/layouts/application.rhtml:103 app/views/search/popup.rhtml:12
  1667 +#: app/views/search/popup.rhtml:44
1655 1668 msgid "Search"
1656 1669 msgstr ""
1657 1670  
... ... @@ -2740,7 +2753,7 @@ msgstr &quot;&quot;
2740 2753 msgid "%{asset_name} in %{category}"
2741 2754 msgstr ""
2742 2755  
2743   -#: app/views/search/category_index.rhtml:7 app/views/search/_product.rhtml:14
  2756 +#: app/views/search/category_index.rhtml:7 app/views/search/_product.rhtml:15
2744 2757 msgid "Category: %s"
2745 2758 msgstr ""
2746 2759  
... ... @@ -2748,23 +2761,23 @@ msgstr &quot;&quot;
2748 2761 msgid "Sub-categories"
2749 2762 msgstr ""
2750 2763  
2751   -#: app/views/search/category_index.rhtml:17
  2764 +#: app/views/search/category_index.rhtml:16
2752 2765 msgid "No sub-categories"
2753 2766 msgstr ""
2754 2767  
2755   -#: app/views/search/_category.rhtml:1 app/views/search/_region.rhtml:1
  2768 +#: app/views/search/_category.rhtml:3 app/views/search/_region.rhtml:3
2756 2769 msgid "Recent articles"
2757 2770 msgstr ""
2758 2771  
2759   -#: app/views/search/_category.rhtml:6 app/views/search/_region.rhtml:6
  2772 +#: app/views/search/_category.rhtml:14 app/views/search/_region.rhtml:14
2760 2773 msgid "Recent Comments"
2761 2774 msgstr ""
2762 2775  
2763   -#: app/views/search/_category.rhtml:12 app/views/search/_region.rhtml:12
  2776 +#: app/views/search/_category.rhtml:33 app/views/search/_region.rhtml:33
2764 2777 msgid "by %{author} on \"%{article}\""
2765 2778 msgstr ""
2766 2779  
2767   -#: app/views/search/_category.rhtml:21 app/views/search/_region.rhtml:21
  2780 +#: app/views/search/_category.rhtml:45 app/views/search/_region.rhtml:45
2768 2781 msgid "Most commented articles"
2769 2782 msgstr ""
2770 2783  
... ... @@ -2795,7 +2808,7 @@ msgid &quot;Products under this category:&quot;
2795 2808 msgstr ""
2796 2809  
2797 2810 #: app/views/search/_product_category.rhtml:15
2798   -#: app/views/search/_product.rhtml:10
  2811 +#: app/views/search/_product.rhtml:11
2799 2812 msgid "Price: %d"
2800 2813 msgstr ""
2801 2814  
... ... @@ -2807,7 +2820,7 @@ msgstr &quot;&quot;
2807 2820 msgid "Users that consumes products in this category:"
2808 2821 msgstr ""
2809 2822  
2810   -#: app/views/search/_product.rhtml:12
  2823 +#: app/views/search/_product.rhtml:13
2811 2824 msgid "Suplier: %s"
2812 2825 msgstr ""
2813 2826  
... ... @@ -2819,23 +2832,23 @@ msgstr &quot;&quot;
2819 2832 msgid "Last update: %s."
2820 2833 msgstr ""
2821 2834  
2822   -#: app/views/search/popup.rhtml:1
  2835 +#: app/views/search/popup.rhtml:3
2823 2836 msgid "Search %s"
2824 2837 msgstr ""
2825 2838  
2826   -#: app/views/search/popup.rhtml:11
  2839 +#: app/views/search/popup.rhtml:16
2827 2840 msgid "Search in:"
2828 2841 msgstr ""
2829 2842  
2830   -#: app/views/search/popup.rhtml:15
  2843 +#: app/views/search/popup.rhtml:20
2831 2844 msgid "Only in %{category}"
2832 2845 msgstr ""
2833 2846  
2834   -#: app/views/search/popup.rhtml:19
  2847 +#: app/views/search/popup.rhtml:24
2835 2848 msgid "Whole site"
2836 2849 msgstr ""
2837 2850  
2838   -#: app/views/search/popup.rhtml:24
  2851 +#: app/views/search/popup.rhtml:30
2839 2852 msgid "Search for:"
2840 2853 msgstr ""
2841 2854  
... ...
po/pt_BR/noosfero.po
  Diff comments   View file @9934289
... ... @@ -9,7 +9,7 @@
9 9 msgid ""
10 10 msgstr ""
11 11 "Project-Id-Version: noosfero 0.9.0\n"
12   -"POT-Creation-Date: 2008-04-17 11:27-0300\n"
  12 +"POT-Creation-Date: 2008-04-24 12:10-0300\n"
13 13 "PO-Revision-Date: 2008-04-01 17:56-0300\n"
14 14 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
15 15 "Language-Team: \n"
... ... @@ -96,7 +96,7 @@ msgstr &quot;Produto atualizado com sucesso&quot;
96 96 msgid "Could not update the product"
97 97 msgstr "Não foi possível atualizar o produto"
98 98  
99   -#: app/controllers/my_profile/cms_controller.rb:87
  99 +#: app/controllers/my_profile/cms_controller.rb:90
100 100 msgid "Article \"%s\" configured as home page."
101 101 msgstr "Artigo \"%s\" configurado como página inicial."
102 102  
... ... @@ -200,6 +200,16 @@ msgstr &quot;Descrição&quot;
200 200 msgid "Product|Image"
201 201 msgstr "Imagem"
202 202  
  203 +#: app/models/product.rb:-
  204 +#, fuzzy
  205 +msgid "Product|Created at"
  206 +msgstr "Criado em"
  207 +
  208 +#: app/models/product.rb:-
  209 +#, fuzzy
  210 +msgid "Product|Updated at"
  211 +msgstr "Atualizado em"
  212 +
203 213 #: app/models/product.rb:32 app/helpers/application_helper.rb:310
204 214 msgid "Uncategorized product"
205 215 msgstr "Produto não categorizado"
... ... @@ -348,11 +358,13 @@ msgid &quot;Article|Profile&quot;
348 358 msgstr "Perfil"
349 359  
350 360 #: app/models/profile.rb:-
351   -msgid "Article|Updated on"
  361 +#, fuzzy
  362 +msgid "Article|Updated at"
352 363 msgstr "Atualizado em"
353 364  
354 365 #: app/models/profile.rb:-
355   -msgid "Article|Created on"
  366 +#, fuzzy
  367 +msgid "Article|Created at"
356 368 msgstr "Criado em"
357 369  
358 370 #: app/models/profile.rb:-
... ... @@ -396,6 +408,11 @@ msgid &quot;Article|Comments count&quot;
396 408 msgstr "Número de comentários"
397 409  
398 410 #: app/models/profile.rb:-
  411 +#, fuzzy
  412 +msgid "Article|Advertise"
  413 +msgstr "Tamanho"
  414 +
  415 +#: app/models/profile.rb:-
399 416 msgid "profile"
400 417 msgstr "perfil"
401 418  
... ... @@ -606,6 +623,7 @@ msgstr &quot;&quot;
606 623 "Clicando em uma pessoa ou grupo você será enviado para sua página inicial."
607 624  
608 625 #: app/models/profile_list_block.rb:69
  626 +#: app/views/search/_display_results.rhtml:24
609 627 msgid "None"
610 628 msgstr "Nenhum(a)"
611 629  
... ... @@ -1143,7 +1161,7 @@ msgstr &quot;Pessoa de contato: %s&quot;
1143 1161 msgid "List of recent content"
1144 1162 msgstr "Lista de conteúdos recentes"
1145 1163  
1146   -#: app/models/recent_documents_block.rb:20
  1164 +#: app/models/recent_documents_block.rb:15
1147 1165 msgid "Recent content"
1148 1166 msgstr "Conteúdo recente"
1149 1167  
... ... @@ -1159,23 +1177,23 @@ msgstr &quot;&quot;
1159 1177 msgid "Tag list"
1160 1178 msgstr "Lista de marcadores"
1161 1179  
1162   -#: app/models/article.rb:71
  1180 +#: app/models/article.rb:75
1163 1181 msgid "HTML Text document"
1164 1182 msgstr "Documento de Texto HTML"
1165 1183  
1166   -#: app/models/article.rb:80
  1184 +#: app/models/article.rb:84
1167 1185 msgid "Article"
1168 1186 msgstr "Artigo"
1169 1187  
1170   -#: app/models/article.rb:82
  1188 +#: app/models/article.rb:86
1171 1189 msgid "\"%s\" article"
1172 1190 msgstr "Artigo \"%s\""
1173 1191  
1174   -#: app/models/article.rb:88
  1192 +#: app/models/article.rb:92
1175 1193 msgid "An ordinary article"
1176 1194 msgstr "Um artigo comum"
1177 1195  
1178   -#: app/models/article.rb:90
  1196 +#: app/models/article.rb:94
1179 1197 msgid "An article of type \"%s\""
1180 1198 msgstr "Um artigo do tipo \"%s\""
1181 1199  
... ... @@ -1276,26 +1294,27 @@ msgid &quot;Comment|Email&quot;
1276 1294 msgstr "E-mail"
1277 1295  
1278 1296 #: app/models/comment.rb:-
1279   -msgid "Comment|Created on"
  1297 +#, fuzzy
  1298 +msgid "Comment|Created at"
1280 1299 msgstr "Criado em"
1281 1300  
1282   -#: app/models/comment.rb:17
  1301 +#: app/models/comment.rb:18
1283 1302 msgid "%{fn} can only be informed for unauthenticated authors"
1284 1303 msgstr "%{fn} só pode ser informado para autores não autenticados"
1285 1304  
1286   -#: app/models/rss_feed.rb:71
  1305 +#: app/models/rss_feed.rb:77
1287 1306 msgid "%s's RSS feed"
1288 1307 msgstr "Feed RSS do(a) %s"
1289 1308  
1290   -#: app/models/rss_feed.rb:73
  1309 +#: app/models/rss_feed.rb:79
1291 1310 msgid "%s's content published at %s"
1292 1311 msgstr "Conteúdo do(a) %s publicado no %s"
1293 1312  
1294   -#: app/models/rss_feed.rb:99
  1313 +#: app/models/rss_feed.rb:105
1295 1314 msgid "RSS Feed"
1296 1315 msgstr "Feed RSS"
1297 1316  
1298   -#: app/models/rss_feed.rb:103
  1317 +#: app/models/rss_feed.rb:109
1299 1318 msgid "Provides a news feed of your more recent articles."
1300 1319 msgstr "Fornece um feed RSS dos seus artigos mais recentes."
1301 1320  
... ... @@ -1333,15 +1352,15 @@ msgstr &quot;Miniatura&quot;
1333 1352  
1334 1353 #: app/models/members_block.rb:4
1335 1354 msgid "A block that displays members."
1336   -msgstr "Um bloco que apresenta os membros."
  1355 +msgstr "Um bloco que apresenta integrantes."
1337 1356  
1338 1357 #: app/models/members_block.rb:8 app/views/profile/index.rhtml:20
1339 1358 msgid "Members"
1340   -msgstr "Membros"
  1359 +msgstr "Integrantes"
1341 1360  
1342 1361 #: app/models/members_block.rb:14
1343   -msgid "All members"
1344   -msgstr "Todos os membros"
  1362 +msgid "View all"
  1363 +msgstr "Ver todas e todos"
1345 1364  
1346 1365 #: app/models/category.rb:-
1347 1366 msgid "category"
... ... @@ -1525,7 +1544,7 @@ msgid &quot;Help&quot;
1525 1544 msgstr "Ajuda"
1526 1545  
1527 1546 #: app/helpers/application_helper.rb:77
1528   -#: app/views/box_organizer/add_block.rhtml:18 app/views/search/popup.rhtml:38
  1547 +#: app/views/box_organizer/add_block.rhtml:18 app/views/search/popup.rhtml:45
1529 1548 msgid "Close"
1530 1549 msgstr "Fechar"
1531 1550  
... ... @@ -1546,19 +1565,19 @@ msgstr &quot;Cancelar&quot;
1546 1565 msgid "No product"
1547 1566 msgstr "Sem produto"
1548 1567  
1549   -#: app/helpers/application_helper.rb:399
  1568 +#: app/helpers/application_helper.rb:401
1550 1569 msgid "Click on this icon to go to the <b>%s</b>'s home page"
1551 1570 msgstr "Clique nesse ícone para ir para a página inicial de <b>%s</b>"
1552 1571  
1553   -#: app/helpers/application_helper.rb:414
  1572 +#: app/helpers/application_helper.rb:416
1554 1573 msgid "%d %B %Y"
1555 1574 msgstr "%d de %B de %Y"
1556 1575  
1557   -#: app/helpers/application_helper.rb:423
  1576 +#: app/helpers/application_helper.rb:425
1558 1577 msgid "%d %B %Y, %H:%m"
1559 1578 msgstr "%d de %B de %Y, %H:%m"
1560 1579  
1561   -#: app/helpers/application_helper.rb:454
  1580 +#: app/helpers/application_helper.rb:456
1562 1581 #: app/views/content_viewer/view_page.rhtml:55
1563 1582 #: app/views/categories/index.rhtml:1
1564 1583 msgid "Categories"
... ... @@ -1693,8 +1712,8 @@ msgstr &quot;Salvar&quot;
1693 1712  
1694 1713 #: app/views/home/index.rhtml:6 app/views/home/index.rhtml:12
1695 1714 #: app/views/region_validators/region.rhtml:23
1696   -#: app/views/layouts/application.rhtml:103 app/views/search/popup.rhtml:7
1697   -#: app/views/search/popup.rhtml:37
  1715 +#: app/views/layouts/application.rhtml:103 app/views/search/popup.rhtml:12
  1716 +#: app/views/search/popup.rhtml:44
1698 1717 msgid "Search"
1699 1718 msgstr "Busca"
1700 1719  
... ... @@ -1764,7 +1783,7 @@ msgstr &quot;Afiliar&quot;
1764 1783  
1765 1784 #: app/views/profile_members/index.rhtml:1
1766 1785 msgid "Listing Members"
1767   -msgstr "Listando Membros"
  1786 +msgstr "Listando Integrantes"
1768 1787  
1769 1788 #: app/views/profile_members/index.rhtml:3
1770 1789 msgid "Affiliate yourself"
... ... @@ -2841,7 +2860,7 @@ msgstr &quot;&quot;
2841 2860 msgid "%{asset_name} in %{category}"
2842 2861 msgstr "%{asset_name} em %{category}"
2843 2862  
2844   -#: app/views/search/category_index.rhtml:7 app/views/search/_product.rhtml:14
  2863 +#: app/views/search/category_index.rhtml:7 app/views/search/_product.rhtml:15
2845 2864 msgid "Category: %s"
2846 2865 msgstr "Categoria: %s"
2847 2866  
... ... @@ -2849,23 +2868,23 @@ msgstr &quot;Categoria: %s&quot;
2849 2868 msgid "Sub-categories"
2850 2869 msgstr "Sub-categorias"
2851 2870  
2852   -#: app/views/search/category_index.rhtml:17
  2871 +#: app/views/search/category_index.rhtml:16
2853 2872 msgid "No sub-categories"
2854 2873 msgstr "Sem sub-categorias"
2855 2874  
2856   -#: app/views/search/_category.rhtml:1 app/views/search/_region.rhtml:1
  2875 +#: app/views/search/_category.rhtml:3 app/views/search/_region.rhtml:3
2857 2876 msgid "Recent articles"
2858 2877 msgstr "Artigos recentes"
2859 2878  
2860   -#: app/views/search/_category.rhtml:6 app/views/search/_region.rhtml:6
  2879 +#: app/views/search/_category.rhtml:14 app/views/search/_region.rhtml:14
2861 2880 msgid "Recent Comments"
2862 2881 msgstr "Comentários recentes"
2863 2882  
2864   -#: app/views/search/_category.rhtml:12 app/views/search/_region.rhtml:12
  2883 +#: app/views/search/_category.rhtml:33 app/views/search/_region.rhtml:33
2865 2884 msgid "by %{author} on \"%{article}\""
2866 2885 msgstr "por %{author} em \"%{article}\""
2867 2886  
2868   -#: app/views/search/_category.rhtml:21 app/views/search/_region.rhtml:21
  2887 +#: app/views/search/_category.rhtml:45 app/views/search/_region.rhtml:45
2869 2888 msgid "Most commented articles"
2870 2889 msgstr "Artigos mais comentados"
2871 2890  
... ... @@ -2896,7 +2915,7 @@ msgid &quot;Products under this category:&quot;
2896 2915 msgstr "Produto nesta categoria:"
2897 2916  
2898 2917 #: app/views/search/_product_category.rhtml:15
2899   -#: app/views/search/_product.rhtml:10
  2918 +#: app/views/search/_product.rhtml:11
2900 2919 msgid "Price: %d"
2901 2920 msgstr "Preço: %d"
2902 2921  
... ... @@ -2908,7 +2927,7 @@ msgstr &quot;Empreendimento:&quot;
2908 2927 msgid "Users that consumes products in this category:"
2909 2928 msgstr "Usuários que consomem produtos nessa categoria:"
2910 2929  
2911   -#: app/views/search/_product.rhtml:12
  2930 +#: app/views/search/_product.rhtml:13
2912 2931 msgid "Suplier: %s"
2913 2932 msgstr "Fornecedor: %s"
2914 2933  
... ... @@ -2920,23 +2939,23 @@ msgstr &quot;por %s&quot;
2920 2939 msgid "Last update: %s."
2921 2940 msgstr "Última atualização: %s."
2922 2941  
2923   -#: app/views/search/popup.rhtml:1
  2942 +#: app/views/search/popup.rhtml:3
2924 2943 msgid "Search %s"
2925 2944 msgstr "Busca em %s"
2926 2945  
2927   -#: app/views/search/popup.rhtml:11
  2946 +#: app/views/search/popup.rhtml:16
2928 2947 msgid "Search in:"
2929 2948 msgstr "Buscar em:"
2930 2949  
2931   -#: app/views/search/popup.rhtml:15
  2950 +#: app/views/search/popup.rhtml:20
2932 2951 msgid "Only in %{category}"
2933 2952 msgstr "Apenas em %{category}"
2934 2953  
2935   -#: app/views/search/popup.rhtml:19
  2954 +#: app/views/search/popup.rhtml:24
2936 2955 msgid "Whole site"
2937 2956 msgstr "Todo o site"
2938 2957  
2939   -#: app/views/search/popup.rhtml:24
  2958 +#: app/views/search/popup.rhtml:30
2940 2959 msgid "Search for:"
2941 2960 msgstr "Buscar por:"
2942 2961  
... ... @@ -3117,7 +3136,7 @@ msgstr &quot;Alterar senha&quot;
3117 3136  
3118 3137 #: app/views/profile_editor/index.rhtml:34
3119 3138 msgid "Manage Members"
3120   -msgstr "Gerenciar membros"
  3139 +msgstr "Gerenciar integrantes"
3121 3140  
3122 3141 #: app/views/profile_editor/index.rhtml:36
3123 3142 msgid "Consumed Products"
... ... @@ -3251,11 +3270,11 @@ msgstr &quot;De volta à página de onde você veio.&quot;
3251 3270  
3252 3271 #: app/views/profile/members.rhtml:2
3253 3272 msgid "Here are all <b>%s</b>'s members."
3254   -msgstr "Aqui estão todos os membros de <b>%s</b>."
  3273 +msgstr "Aqui estão todos os integrantes de <b>%s</b>."
3255 3274  
3256 3275 #: app/views/profile/members.rhtml:4
3257 3276 msgid "%s' members"
3258   -msgstr "Membros de %s"
  3277 +msgstr "Integrantes de %s"
3259 3278  
3260 3279 #: app/views/profile/enterprises.rhtml:2
3261 3280 msgid "Here are all <b>%s</b>'s enterprises."
... ... @@ -3309,6 +3328,9 @@ msgstr &quot;Tem certeza que quer excluir \&quot;%s\&quot; e todas as suas subcategorias?&quot;
3309 3328 msgid "Editing %s"
3310 3329 msgstr "Editando %s"
3311 3330  
  3331 +#~ msgid "All members"
  3332 +#~ msgstr "Todos as/os integrantes"
  3333 +
3312 3334 #~ msgid "User|Login"
3313 3335 #~ msgstr "Nome de usuário"
3314 3336  
... ... @@ -3348,9 +3370,6 @@ msgstr &quot;Editando %s&quot;
3348 3370 #~ msgid "Person|Data"
3349 3371 #~ msgstr "Dados"
3350 3372  
3351   -#~ msgid "Person|Created at"
3352   -#~ msgstr "Criado em"
3353   -
3354 3373 #~ msgid "Password"
3355 3374 #~ msgstr "Senha"
3356 3375  
... ...
test/unit/slug_test.rb 0 → 100644
  Diff comments   View file @9934289
... ... @@ -0,0 +1,26 @@
  1 +require File.dirname(__FILE__) + '/../test_helper'
  2 +
  3 +# tests for String#to_slug core extension. See lib/noosfero/core_ext/string.rb
  4 +class SlugTest < Test::Unit::TestCase
  5 +
  6 + should 'keep only alphanum' do
  7 + assert_equal 'abc', 'abc!)@(*#&@!*#*)'.to_slug
  8 + end
  9 +
  10 + should 'turn punctuation into dashes' do
  11 + assert_equal 'a-b-c-d-e-f', 'a:b;c+d=e_f'.to_slug
  12 + end
  13 +
  14 + should 'truncate dashes' do
  15 + assert_equal 'a-b-c', 'a---b: c ;;;'.to_slug
  16 + end
  17 +
  18 + should 'turn spaces into dashes' do
  19 + assert_equal 'a-b', 'a b'.to_slug
  20 + end
  21 +
  22 + should 'remove dots' do
  23 + assert_equal 'a-b', 'a.b'.to_slug
  24 + end
  25 +
  26 +end
... ...