Commit 15bc10a1db6f4ad9e10064d5ea152550bbc3d0a0
1 parent
f145286e
Exists in
master
and in
2 other branches
Resolvendo alguns bugs do modal do mural
Showing
3 changed files
with
35 additions
and
25 deletions
Show diff stats
mural/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid "" | @@ -8,7 +8,7 @@ msgid "" | ||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
11 | -"POT-Creation-Date: 2017-03-09 17:01-0300\n" | 11 | +"POT-Creation-Date: 2017-03-28 22:35-0300\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
@@ -39,13 +39,14 @@ msgid "Action" | @@ -39,13 +39,14 @@ msgid "Action" | ||
39 | msgstr "Ação" | 39 | msgstr "Ação" |
40 | 40 | ||
41 | #: mural/models.py:21 mural/models.py:105 mural/models.py:119 | 41 | #: mural/models.py:21 mural/models.py:105 mural/models.py:119 |
42 | +#: mural/templates/mural/_form_comment.html:66 | ||
42 | #: mural/templates/mural/_view_comment.html:14 | 43 | #: mural/templates/mural/_view_comment.html:14 |
43 | msgid "Comment" | 44 | msgid "Comment" |
44 | -msgstr "Comentou" | 45 | +msgstr "Comentar" |
45 | 46 | ||
46 | #: mural/models.py:21 | 47 | #: mural/models.py:21 |
47 | msgid "Ask for Help" | 48 | msgid "Ask for Help" |
48 | -msgstr "Pediu ajuda" | 49 | +msgstr "Pedir ajuda" |
49 | 50 | ||
50 | #: mural/models.py:22 mural/models.py:107 mural/models.py:118 | 51 | #: mural/models.py:22 mural/models.py:107 mural/models.py:118 |
51 | #: mural/models.py:127 | 52 | #: mural/models.py:127 |
@@ -95,18 +96,24 @@ msgstr "" | @@ -95,18 +96,24 @@ msgstr "" | ||
95 | 96 | ||
96 | #: mural/templates/mural/_form.html:76 | 97 | #: mural/templates/mural/_form.html:76 |
97 | #: mural/templates/mural/_form_comment.html:42 | 98 | #: mural/templates/mural/_form_comment.html:42 |
98 | -msgid "Click or drop the file here" | ||
99 | -msgstr "Clique ou solte o arquivo aqui" | 99 | +#, fuzzy |
100 | +#| msgid "Click or drop the file here" | ||
101 | +msgid "Click or drop the picture here" | ||
102 | +msgstr "Clique ou solte a imagem aqui" | ||
100 | 103 | ||
101 | #: mural/templates/mural/_form.html:78 | 104 | #: mural/templates/mural/_form.html:78 |
102 | #: mural/templates/mural/_form_comment.html:44 | 105 | #: mural/templates/mural/_form_comment.html:44 |
103 | -msgid "The file could not exceed 5MB." | ||
104 | -msgstr "O arquivo não pode exceder 5MB." | 106 | +#, fuzzy |
107 | +#| msgid "The file could not exceed 5MB." | ||
108 | +msgid "The picture could not exceed 5MB." | ||
109 | +msgstr "A imagem não pode exceder 5MB." | ||
105 | 110 | ||
106 | #: mural/templates/mural/_form.html:100 | 111 | #: mural/templates/mural/_form.html:100 |
107 | -#: mural/templates/mural/_form_comment.html:66 | ||
108 | -msgid "Save" | ||
109 | -msgstr "Salvar" | 112 | +#, fuzzy |
113 | +#| msgid "Post" | ||
114 | +msgctxt "button" | ||
115 | +msgid "Post" | ||
116 | +msgstr "Postar" | ||
110 | 117 | ||
111 | #: mural/templates/mural/_form.html:101 | 118 | #: mural/templates/mural/_form.html:101 |
112 | #: mural/templates/mural/_form_comment.html:67 | 119 | #: mural/templates/mural/_form_comment.html:67 |
@@ -364,3 +371,6 @@ msgstr "Seu comentário foi editado com sucesso!" | @@ -364,3 +371,6 @@ msgstr "Seu comentário foi editado com sucesso!" | ||
364 | #: mural/views.py:1519 | 371 | #: mural/views.py:1519 |
365 | msgid "Comment deleted successfully!" | 372 | msgid "Comment deleted successfully!" |
366 | msgstr "Comentário deletado com sucesso!" | 373 | msgstr "Comentário deletado com sucesso!" |
374 | + | ||
375 | +#~ msgid "Save" | ||
376 | +#~ msgstr "Salvar" |
mural/templates/mural/_form.html
@@ -73,9 +73,9 @@ | @@ -73,9 +73,9 @@ | ||
73 | {% render_field form.image %} | 73 | {% render_field form.image %} |
74 | 74 | ||
75 | <div class="filedrag"> | 75 | <div class="filedrag"> |
76 | - {% trans 'Click or drop the file here' %}<br /> | 76 | + {% trans 'Click or drop the picture here' %}<br /> |
77 | 77 | ||
78 | - <small>{% trans 'The file could not exceed 5MB.' %}</small> | 78 | + <small>{% trans 'The picture could not exceed 5MB.' %}</small> |
79 | </div> | 79 | </div> |
80 | 80 | ||
81 | <span id="helpBlock" class="help-block">{{ form.image.help_text }}</span> | 81 | <span id="helpBlock" class="help-block">{{ form.image.help_text }}</span> |
@@ -97,7 +97,7 @@ | @@ -97,7 +97,7 @@ | ||
97 | </div> | 97 | </div> |
98 | <div class="modal-footer"> | 98 | <div class="modal-footer"> |
99 | <div class="col-md-12"> | 99 | <div class="col-md-12"> |
100 | - <button type="submit" id="button" form="post-form" class="btn btn-success btn-raised post-button pull-left">{% trans "Save" %}</button> | 100 | + <button type="submit" id="button" form="post-form" class="btn btn-success btn-raised post-button pull-left">{% trans "Post" context "button"%}</button> |
101 | <button type="button" class="btn btn-raised btn-default pull-right" data-dismiss="modal">{% trans "Cancel" %}</button> | 101 | <button type="button" class="btn btn-raised btn-default pull-right" data-dismiss="modal">{% trans "Cancel" %}</button> |
102 | </div> | 102 | </div> |
103 | </div> | 103 | </div> |
mural/templates/mural/_form_comment.html
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | {% render_field form.comment class='form-control text_simple_wysiwyg' %} | 11 | {% render_field form.comment class='form-control text_simple_wysiwyg' %} |
12 | 12 | ||
13 | <span id="helpBlock" class="help-block">{{ form.post.help_text }}</span> | 13 | <span id="helpBlock" class="help-block">{{ form.post.help_text }}</span> |
14 | - | 14 | + |
15 | {% if form.comment.errors %} | 15 | {% if form.comment.errors %} |
16 | <div class="alert alert-danger alert-dismissible" role="alert"> | 16 | <div class="alert alert-danger alert-dismissible" role="alert"> |
17 | <button type="button" class="close" data-dismiss="alert" aria-label="Close"> | 17 | <button type="button" class="close" data-dismiss="alert" aria-label="Close"> |
@@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
28 | 28 | ||
29 | <div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput"> | 29 | <div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput"> |
30 | {% render_field form.image %} | 30 | {% render_field form.image %} |
31 | - | 31 | + |
32 | <div class="input-group common-file-input"> | 32 | <div class="input-group common-file-input"> |
33 | <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}"> | 33 | <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}"> |
34 | <span class="input-group-btn input-group-sm"> | 34 | <span class="input-group-btn input-group-sm"> |
@@ -39,13 +39,13 @@ | @@ -39,13 +39,13 @@ | ||
39 | </div> | 39 | </div> |
40 | 40 | ||
41 | <div class="filedrag"> | 41 | <div class="filedrag"> |
42 | - {% trans 'Click or drop the file here' %}<br /> | ||
43 | - | ||
44 | - <small>{% trans 'The file could not exceed 5MB.' %}</small> | 42 | + {% trans 'Click or drop the picture here' %}<br /> |
43 | + | ||
44 | + <small>{% trans 'The picture could not exceed 5MB.' %}</small> | ||
45 | </div> | 45 | </div> |
46 | 46 | ||
47 | <span id="helpBlock" class="help-block">{{ form.image.help_text }}</span> | 47 | <span id="helpBlock" class="help-block">{{ form.image.help_text }}</span> |
48 | - | 48 | + |
49 | {% if form.image.errors %} | 49 | {% if form.image.errors %} |
50 | <div class="alert alert-danger alert-dismissible" role="alert"> | 50 | <div class="alert alert-danger alert-dismissible" role="alert"> |
51 | <button type="button" class="close" data-dismiss="alert" aria-label="Close"> | 51 | <button type="button" class="close" data-dismiss="alert" aria-label="Close"> |
@@ -63,7 +63,7 @@ | @@ -63,7 +63,7 @@ | ||
63 | </div> | 63 | </div> |
64 | <div class="modal-footer"> | 64 | <div class="modal-footer"> |
65 | <div class="col-md-12"> | 65 | <div class="col-md-12"> |
66 | - <button type="submit" id="button" form="comment-form" class="btn btn-success btn-raised post-button pull-left">{% trans "Save" %}</button> | 66 | + <button type="submit" id="button" form="comment-form" class="btn btn-success btn-raised post-button pull-left">{% trans "Comment" %}</button> |
67 | <button type="button" class="btn btn-raised btn-default pull-right" data-dismiss="modal">{% trans "Cancel" %}</button> | 67 | <button type="button" class="btn btn-raised btn-default pull-right" data-dismiss="modal">{% trans "Cancel" %}</button> |
68 | </div> | 68 | </div> |
69 | </div> | 69 | </div> |
@@ -118,7 +118,7 @@ | @@ -118,7 +118,7 @@ | ||
118 | 118 | ||
119 | $(node).addClass('marked_user'); | 119 | $(node).addClass('marked_user'); |
120 | $(node).html(value); | 120 | $(node).html(value); |
121 | - | 121 | + |
122 | var code = context.invoke('code'); | 122 | var code = context.invoke('code'); |
123 | 123 | ||
124 | var new_code = $(code).append(node).append(" "); | 124 | var new_code = $(code).append(node).append(" "); |
@@ -130,7 +130,7 @@ | @@ -130,7 +130,7 @@ | ||
130 | } | 130 | } |
131 | }); | 131 | }); |
132 | 132 | ||
133 | - return button.render(); // return button as jquery object | 133 | + return button.render(); // return button as jquery object |
134 | } | 134 | } |
135 | 135 | ||
136 | $('.text_simple_wysiwyg').summernote({ | 136 | $('.text_simple_wysiwyg').summernote({ |
@@ -155,7 +155,7 @@ | @@ -155,7 +155,7 @@ | ||
155 | }); | 155 | }); |
156 | 156 | ||
157 | var typingSearchTimer; //timer identifier | 157 | var typingSearchTimer; //timer identifier |
158 | - var doneTypingSearchInterval = 1000; | 158 | + var doneTypingSearchInterval = 1000; |
159 | 159 | ||
160 | function typing_search(field) { | 160 | function typing_search(field) { |
161 | clearTimeout(typingSearchTimer); | 161 | clearTimeout(typingSearchTimer); |
@@ -178,7 +178,7 @@ | @@ -178,7 +178,7 @@ | ||
178 | function searchUsers (field) { | 178 | function searchUsers (field) { |
179 | var url = $('.suggestions').data('url'), | 179 | var url = $('.suggestions').data('url'), |
180 | param = field.val(); | 180 | param = field.val(); |
181 | - | 181 | + |
182 | $.ajax({ | 182 | $.ajax({ |
183 | url: url, | 183 | url: url, |
184 | data: {'param': param}, | 184 | data: {'param': param}, |
@@ -206,7 +206,7 @@ | @@ -206,7 +206,7 @@ | ||
206 | var small = $("#id_image"), | 206 | var small = $("#id_image"), |
207 | filedrag = $(".filedrag"), | 207 | filedrag = $(".filedrag"), |
208 | common = $(".common-file-input"); | 208 | common = $(".common-file-input"); |
209 | - | 209 | + |
210 | // file select | 210 | // file select |
211 | small.on("change", FileSelectHandler); | 211 | small.on("change", FileSelectHandler); |
212 | 212 |