Download as
Browse Code »

Commit aca3cda861f279a1d3f093fbd1400a906cf7dd1e

Authored by LeandroNunes
1 parent ba4e9743
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

ActionItem85: fixing bug 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@770 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 64 additions and 56 deletions   Show diff stats
app/views/membership_editor/index.rhtml
  Diff comments   View file @aca3cda
... ... @@ -7,8 +7,8 @@
7 7 <ul>
8 8 <% @memberships.each do |m|%>
9 9 <li>
10   - <%= link_to m.name, '/' + m.identifier %>
11   - <%= link_to _('Manage') , '/myprofile/' + m.identifier %>
  10 + <%= link_to_homepage m.name, m.identifier %>
  11 + <%= link_to_myprofile _('Manage') , {}, m.identifier %>
12 12 </li>
13 13 <% end %>
14 14 </ul>
... ...
po/noosfero.pot
  Diff comments   View file @aca3cda
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.3.0\n"
10   -"POT-Creation-Date: 2007-10-19 23:08-0300\n"
  10 +"POT-Creation-Date: 2007-10-20 00:09-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"
... ... @@ -136,7 +136,7 @@ msgstr &quot;&quot;
136 136 msgid "The supplied current password is incorrect."
137 137 msgstr ""
138 138  
139   -#: app/controllers/application.rb:50
  139 +#: app/controllers/application.rb:43
140 140 msgid "There is no page %s"
141 141 msgstr ""
142 142  
... ... @@ -804,7 +804,11 @@ msgstr &quot;&quot;
804 804 msgid "Accessibility"
805 805 msgstr ""
806 806  
807   -#: app/helpers/application_helper.rb:260 app/helpers/application_helper.rb:261
  807 +#: app/helpers/application_helper.rb:260
  808 +msgid " "
  809 +msgstr ""
  810 +
  811 +#: app/helpers/application_helper.rb:261
808 812 #: app/views/region_validators/region.rhtml:22
809 813 #: app/views/manage_tags/_search_box.rhtml:4
810 814 #: app/views/membership_editor/index.rhtml:4
... ... @@ -879,79 +883,79 @@ msgstr &quot;&quot;
879 883 msgid "DRAG"
880 884 msgstr ""
881 885  
882   -#: app/views/cms/_form.rhtml:9
  886 +#: app/views/cms/_form.rhtml:27
883 887 msgid "Title"
884 888 msgstr ""
885 889  
886   -#: app/views/cms/_form.rhtml:10
  890 +#: app/views/cms/_form.rhtml:28
887 891 msgid "More..."
888 892 msgstr ""
889 893  
890   -#: app/views/cms/_form.rhtml:10
  894 +#: app/views/cms/_form.rhtml:28
891 895 msgid "Less..."
892 896 msgstr ""
893 897  
894   -#: app/views/cms/_form.rhtml:14
  898 +#: app/views/cms/_form.rhtml:32
895 899 msgid "Slug"
896 900 msgstr ""
897 901  
898   -#: app/views/cms/_form.rhtml:20
  902 +#: app/views/cms/_form.rhtml:38
899 903 msgid "Keywords"
900 904 msgstr ""
901 905  
902   -#: app/views/cms/_form.rhtml:27
  906 +#: app/views/cms/_form.rhtml:45
903 907 msgid "Parent"
904 908 msgstr ""
905 909  
906   -#: app/views/cms/_form.rhtml:29
  910 +#: app/views/cms/_form.rhtml:47
907 911 msgid "%s is a root page"
908 912 msgstr ""
909 913  
910   -#: app/views/cms/_form.rhtml:37
  914 +#: app/views/cms/_form.rhtml:55
911 915 msgid "Content"
912 916 msgstr ""
913 917  
914   -#: app/views/cms/_form.rhtml:43
  918 +#: app/views/cms/_form.rhtml:61
915 919 msgid "Filter"
916 920 msgstr ""
917 921  
918   -#: app/views/cms/_form.rhtml:45
  922 +#: app/views/cms/_form.rhtml:63
919 923 msgid "Converts plain text into HTML"
920 924 msgstr ""
921 925  
922   -#: app/views/cms/_form.rhtml:51
  926 +#: app/views/cms/_form.rhtml:69
923 927 msgid "Created"
924 928 msgstr ""
925 929  
926   -#: app/views/cms/_form.rhtml:60
  930 +#: app/views/cms/_form.rhtml:78
927 931 msgid "One revision"
928 932 msgid_plural "%d revisions"
929 933 msgstr[0] ""
930 934 msgstr[1] ""
931 935  
932   -#: app/views/cms/_form.rhtml:66
  936 +#: app/views/cms/_form.rhtml:84
933 937 msgid "Loading preview ..."
934 938 msgstr ""
935 939  
936   -#: app/views/cms/_form.rhtml:67
  940 +#: app/views/cms/_form.rhtml:85
937 941 msgid "Save Changes"
938 942 msgstr ""
939 943  
940   -#: app/views/cms/_form.rhtml:67
  944 +#: app/views/cms/_form.rhtml:85
941 945 msgid "Create Page"
942 946 msgstr ""
943 947  
944   -#: app/views/cms/_form.rhtml:69
  948 +#: app/views/cms/_form.rhtml:87
945 949 msgid "Revert"
946 950 msgstr ""
947 951  
948   -#: app/views/cms/_form.rhtml:72
  952 +#: app/views/cms/_form.rhtml:90
949 953 msgid ""
950 954 "Changes detected. You will lose all the updates you have made if you "
951 955 "proceed..."
952 956 msgstr ""
953 957  
954   -#: app/views/cms/_form.rhtml:72 app/views/cms/delete.rhtml:16
  958 +#: app/views/cms/_form.rhtml:90 app/views/cms/delete.rhtml:16
955 959 #: app/views/cms/versions.rhtml:25 app/views/role/_form.rhtml:13
956 960 #: app/views/profile_members/change_role.rhtml:12
957 961 #: app/views/enterprise_editor/edit.rhtml:8 app/views/manage_tags/new.rhtml:6
... ... @@ -963,23 +967,23 @@ msgstr &quot;&quot;
963 967 msgid "Cancel"
964 968 msgstr ""
965 969  
966   -#: app/views/cms/_form.rhtml:78
  970 +#: app/views/cms/_form.rhtml:96
967 971 msgid "Page Preview"
968 972 msgstr ""
969 973  
970   -#: app/views/cms/_form.rhtml:80
  974 +#: app/views/cms/_form.rhtml:98
971 975 msgid "Loading Preview..."
972 976 msgstr ""
973 977  
974   -#: app/views/cms/_form.rhtml:85
  978 +#: app/views/cms/_form.rhtml:103
975 979 msgid "Close Preview"
976 980 msgstr ""
977 981  
978   -#: app/views/cms/_form.rhtml:85 app/views/cms/versions.rhtml:24
  982 +#: app/views/cms/_form.rhtml:103 app/views/cms/versions.rhtml:24
979 983 msgid "or"
980 984 msgstr ""
981 985  
982   -#: app/views/cms/_form.rhtml:85
  986 +#: app/views/cms/_form.rhtml:103
983 987 msgid "Back to top"
984 988 msgstr ""
985 989  
... ... @@ -1047,7 +1051,7 @@ msgstr &quot;&quot;
1047 1051 msgid "Current Version"
1048 1052 msgstr ""
1049 1053  
1050   -#: app/views/cms/edit.rhtml:20
  1054 +#: app/views/cms/edit.rhtml:2
1051 1055 msgid "Edit Page"
1052 1056 msgstr ""
1053 1057  
... ...
po/pt_BR/noosfero.po
  Diff comments   View file @aca3cda
... ... @@ -9,7 +9,7 @@
9 9 msgid ""
10 10 msgstr ""
11 11 "Project-Id-Version: noosfero 0.3.0\n"
12   -"POT-Creation-Date: 2007-10-19 23:08-0300\n"
  12 +"POT-Creation-Date: 2007-10-20 00:09-0300\n"
13 13 "PO-Revision-Date: 2007-10-19 21:25-0300\n"
14 14 "Last-Translator: Rafael Tavares Bomfim <rafael@colivre.coop.br>\n"
15 15 "Language-Team: \n"
... ... @@ -141,7 +141,7 @@ msgstr &quot;Sua senha foi alterada com sucesso!&quot;
141 141 msgid "The supplied current password is incorrect."
142 142 msgstr "A senha informada está incorreta"
143 143  
144   -#: app/controllers/application.rb:50
  144 +#: app/controllers/application.rb:43
145 145 msgid "There is no page %s"
146 146 msgstr "Não há página: %s"
147 147  
... ... @@ -824,7 +824,11 @@ msgstr &quot;Mudar tema do ícone&quot;
824 824 msgid "Accessibility"
825 825 msgstr "Acessibilidade"
826 826  
827   -#: app/helpers/application_helper.rb:260 app/helpers/application_helper.rb:261
  827 +#: app/helpers/application_helper.rb:260
  828 +msgid " "
  829 +msgstr ""
  830 +
  831 +#: app/helpers/application_helper.rb:261
828 832 #: app/views/region_validators/region.rhtml:22
829 833 #: app/views/manage_tags/_search_box.rhtml:4
830 834 #: app/views/membership_editor/index.rhtml:4
... ... @@ -899,73 +903,73 @@ msgstr &quot;Excluir página &#39;%s&#39; e todos seus filhos&quot;
899 903 msgid "DRAG"
900 904 msgstr "ARRASTE"
901 905  
902   -#: app/views/cms/_form.rhtml:9
  906 +#: app/views/cms/_form.rhtml:27
903 907 msgid "Title"
904 908 msgstr "Título"
905 909  
906   -#: app/views/cms/_form.rhtml:10
  910 +#: app/views/cms/_form.rhtml:28
907 911 msgid "More..."
908 912 msgstr "Mais..."
909 913  
910   -#: app/views/cms/_form.rhtml:10
  914 +#: app/views/cms/_form.rhtml:28
911 915 msgid "Less..."
912 916 msgstr "Menos..."
913 917  
914   -#: app/views/cms/_form.rhtml:14
  918 +#: app/views/cms/_form.rhtml:32
915 919 msgid "Slug"
916 920 msgstr "Atalho"
917 921  
918   -#: app/views/cms/_form.rhtml:20
  922 +#: app/views/cms/_form.rhtml:38
919 923 msgid "Keywords"
920 924 msgstr "Palvras-chave"
921 925  
922   -#: app/views/cms/_form.rhtml:27
  926 +#: app/views/cms/_form.rhtml:45
923 927 msgid "Parent"
924 928 msgstr "Pai"
925 929  
926   -#: app/views/cms/_form.rhtml:29
  930 +#: app/views/cms/_form.rhtml:47
927 931 msgid "%s is a root page"
928 932 msgstr "%s é uma página raiz"
929 933  
930   -#: app/views/cms/_form.rhtml:37
  934 +#: app/views/cms/_form.rhtml:55
931 935 msgid "Content"
932 936 msgstr "Conteúdo"
933 937  
934   -#: app/views/cms/_form.rhtml:43
  938 +#: app/views/cms/_form.rhtml:61
935 939 msgid "Filter"
936 940 msgstr "Filtro"
937 941  
938   -#: app/views/cms/_form.rhtml:45
  942 +#: app/views/cms/_form.rhtml:63
939 943 msgid "Converts plain text into HTML"
940 944 msgstr "Converte texto plano em HTML"
941 945  
942   -#: app/views/cms/_form.rhtml:51
  946 +#: app/views/cms/_form.rhtml:69
943 947 msgid "Created"
944 948 msgstr "Criado"
945 949  
946   -#: app/views/cms/_form.rhtml:60
  950 +#: app/views/cms/_form.rhtml:78
947 951 msgid "One revision"
948 952 msgid_plural "%d revisions"
949 953 msgstr[0] "Uma revisão"
950 954 msgstr[1] "%d revisões"
951 955  
952   -#: app/views/cms/_form.rhtml:66
  956 +#: app/views/cms/_form.rhtml:84
953 957 msgid "Loading preview ..."
954 958 msgstr "Carregando pré-visualização ..."
955 959  
956   -#: app/views/cms/_form.rhtml:67
  960 +#: app/views/cms/_form.rhtml:85
957 961 msgid "Save Changes"
958 962 msgstr "Salvar Mudanças"
959 963  
960   -#: app/views/cms/_form.rhtml:67
  964 +#: app/views/cms/_form.rhtml:85
961 965 msgid "Create Page"
962 966 msgstr "Criar Página"
963 967  
964   -#: app/views/cms/_form.rhtml:69
  968 +#: app/views/cms/_form.rhtml:87
965 969 msgid "Revert"
966 970 msgstr "Reverter"
967 971  
968   -#: app/views/cms/_form.rhtml:72
  972 +#: app/views/cms/_form.rhtml:90
969 973 msgid ""
970 974 "Changes detected. You will lose all the updates you have made if you "
971 975 "proceed..."
... ... @@ -973,7 +977,7 @@ msgstr &quot;&quot;
973 977 "Mudanças detectadas. Você vai perder todas as atualizações que você fez se "
974 978 "continuar..."
975 979  
976   -#: app/views/cms/_form.rhtml:72 app/views/cms/delete.rhtml:16
  980 +#: app/views/cms/_form.rhtml:90 app/views/cms/delete.rhtml:16
977 981 #: app/views/cms/versions.rhtml:25 app/views/role/_form.rhtml:13
978 982 #: app/views/profile_members/change_role.rhtml:12
979 983 #: app/views/enterprise_editor/edit.rhtml:8 app/views/manage_tags/new.rhtml:6
... ... @@ -985,23 +989,23 @@ msgstr &quot;&quot;
985 989 msgid "Cancel"
986 990 msgstr "Cancelar"
987 991  
988   -#: app/views/cms/_form.rhtml:78
  992 +#: app/views/cms/_form.rhtml:96
989 993 msgid "Page Preview"
990 994 msgstr "Pré-visualização da página"
991 995  
992   -#: app/views/cms/_form.rhtml:80
  996 +#: app/views/cms/_form.rhtml:98
993 997 msgid "Loading Preview..."
994 998 msgstr "Carregando Pré-visualzação..."
995 999  
996   -#: app/views/cms/_form.rhtml:85
  1000 +#: app/views/cms/_form.rhtml:103
997 1001 msgid "Close Preview"
998 1002 msgstr "Fechar Pré-visualzação"
999 1003  
1000   -#: app/views/cms/_form.rhtml:85 app/views/cms/versions.rhtml:24
  1004 +#: app/views/cms/_form.rhtml:103 app/views/cms/versions.rhtml:24
1001 1005 msgid "or"
1002 1006 msgstr "ou"
1003 1007  
1004   -#: app/views/cms/_form.rhtml:85
  1008 +#: app/views/cms/_form.rhtml:103
1005 1009 msgid "Back to top"
1006 1010 msgstr "Voltar ao topo"
1007 1011  
... ... @@ -1069,7 +1073,7 @@ msgstr &quot;Tornar versão atual&quot;
1069 1073 msgid "Current Version"
1070 1074 msgstr "Versão Atual"
1071 1075  
1072   -#: app/views/cms/edit.rhtml:20
  1076 +#: app/views/cms/edit.rhtml:2
1073 1077 msgid "Edit Page"
1074 1078 msgstr "Editar Página"
1075 1079  
... ...