Show More
The requested changes are too big and content was truncated. Show full diff
@@ -0,0 +1,41 b'' | |||||
|
1 | |RCE| 4.19.1 |RNS| | |||
|
2 | ------------------ | |||
|
3 | ||||
|
4 | Release Date | |||
|
5 | ^^^^^^^^^^^^ | |||
|
6 | ||||
|
7 | - 2020-05-25 | |||
|
8 | ||||
|
9 | ||||
|
10 | New Features | |||
|
11 | ^^^^^^^^^^^^ | |||
|
12 | ||||
|
13 | ||||
|
14 | ||||
|
15 | General | |||
|
16 | ^^^^^^^ | |||
|
17 | ||||
|
18 | ||||
|
19 | ||||
|
20 | Security | |||
|
21 | ^^^^^^^^ | |||
|
22 | ||||
|
23 | - issue-tracker: fixed XSS inside the newly generated description fields. | |||
|
24 | ||||
|
25 | ||||
|
26 | Performance | |||
|
27 | ^^^^^^^^^^^ | |||
|
28 | ||||
|
29 | - | |||
|
30 | ||||
|
31 | ||||
|
32 | Fixes | |||
|
33 | ^^^^^ | |||
|
34 | ||||
|
35 | - HTTP: fixed headers problems in the application. | |||
|
36 | ||||
|
37 | ||||
|
38 | Upgrade notes | |||
|
39 | ^^^^^^^^^^^^^ | |||
|
40 | ||||
|
41 | - Un-scheduled release addressing problems in 4.19.X releases. |
@@ -0,0 +1,52 b'' | |||||
|
1 | |RCE| 4.19.2 |RNS| | |||
|
2 | ------------------ | |||
|
3 | ||||
|
4 | Release Date | |||
|
5 | ^^^^^^^^^^^^ | |||
|
6 | ||||
|
7 | - 2020-06-10 | |||
|
8 | ||||
|
9 | ||||
|
10 | New Features | |||
|
11 | ^^^^^^^^^^^^ | |||
|
12 | ||||
|
13 | - Files: landing refs will be the default for files view, resulting in names of branches instead of hashes. | |||
|
14 | This fixes some problems reported with navigation, and also SVN. | |||
|
15 | - Diffs: expose per-file comment counts. | |||
|
16 | ||||
|
17 | ||||
|
18 | General | |||
|
19 | ^^^^^^^ | |||
|
20 | ||||
|
21 | - Navigation: explicitly link to summary page for summary link. | |||
|
22 | - Main Page: simplify footer, and expose docs link. | |||
|
23 | - Docs: added mention how to change default integration templates. | |||
|
24 | - Files: use ref names in the url, and make usage of default landing refs. | |||
|
25 | - Files: report the name of missing commit. | |||
|
26 | - Sweet alerts: reduced font size. | |||
|
27 | ||||
|
28 | ||||
|
29 | Security | |||
|
30 | ^^^^^^^^ | |||
|
31 | ||||
|
32 | - Branch permissions: fix XSS on branch permissions adding screen. | |||
|
33 | ||||
|
34 | ||||
|
35 | Performance | |||
|
36 | ^^^^^^^^^^^ | |||
|
37 | ||||
|
38 | ||||
|
39 | ||||
|
40 | Fixes | |||
|
41 | ^^^^^ | |||
|
42 | ||||
|
43 | - Emails: improved styling, and fixed problems with some email clients rendering. | |||
|
44 | - Files: fixed label for copy-path action. | |||
|
45 | - Files: use a common function to handle url-by-refs, and fix landing refs for SVN. | |||
|
46 | ||||
|
47 | ||||
|
48 | Upgrade notes | |||
|
49 | ^^^^^^^^^^^^^ | |||
|
50 | ||||
|
51 | - Un-scheduled release addressing problems in 4.19.X releases. | |||
|
52 | It brings some added features that weren't ready for 4.19.0. |
@@ -62,3 +62,6 b' f37a3126570477543507f0bc9d245ce75546181a' | |||||
62 | 71d8791463e87b64c1a18475de330ee600d37561 v4.18.1 |
|
62 | 71d8791463e87b64c1a18475de330ee600d37561 v4.18.1 | |
63 | 4bd6b75dac1d25c64885d4d49385e5533f21c525 v4.18.2 |
|
63 | 4bd6b75dac1d25c64885d4d49385e5533f21c525 v4.18.2 | |
64 | 12ed92fe57f2e9fc7b71dc0b65e26c2da5c7085f v4.18.3 |
|
64 | 12ed92fe57f2e9fc7b71dc0b65e26c2da5c7085f v4.18.3 | |
|
65 | ddef396a6567117de531d67d44c739cbbfc3eebb v4.19.0 | |||
|
66 | c0c65acd73914bf4368222d510afe1161ab8c07c v4.19.1 | |||
|
67 | 7ac623a4a2405917e2af660d645ded662011e40d v4.19.2 |
@@ -25,3 +25,10 b' transition status id in the *Workflow* s' | |||||
25 |
|
25 | |||
26 | Once you have the transition status id, you can create a JIRA integration |
|
26 | Once you have the transition status id, you can create a JIRA integration | |
27 | as outlined in :ref:`creating-integrations`. |
|
27 | as outlined in :ref:`creating-integrations`. | |
|
28 | ||||
|
29 | ||||
|
30 | .. note:: | |||
|
31 | ||||
|
32 | There's an option to configure integration templates. | |||
|
33 | Please see :ref:`integrations-rcextensions` section. | |||
|
34 | rcextensions examples are here: https://code.rhodecode.com/rhodecode-enterprise-ce/files/default/rhodecode/config/rcextensions/examples/custom_integration_templates.py |
@@ -26,3 +26,9 b' available.' | |||||
26 |
|
26 | |||
27 | Once you have the API key, create a Redmine integration as outlined in |
|
27 | Once you have the API key, create a Redmine integration as outlined in | |
28 | :ref:`creating-integrations`. |
|
28 | :ref:`creating-integrations`. | |
|
29 | ||||
|
30 | ||||
|
31 | .. note:: | |||
|
32 | ||||
|
33 | There's an option to configure integration templates. Please see :ref:`integrations-rcextensions` section. | |||
|
34 | rcextensions examples are here: https://code.rhodecode.com/rhodecode-enterprise-ce/files/default/rhodecode/config/rcextensions/examples/custom_integration_templates.py No newline at end of file |
@@ -9,6 +9,8 b' Release Notes' | |||||
9 | .. toctree:: |
|
9 | .. toctree:: | |
10 | :maxdepth: 1 |
|
10 | :maxdepth: 1 | |
11 |
|
11 | |||
|
12 | release-notes-4.19.2.rst | |||
|
13 | release-notes-4.19.1.rst | |||
12 | release-notes-4.19.0.rst |
|
14 | release-notes-4.19.0.rst | |
13 | release-notes-4.18.3.rst |
|
15 | release-notes-4.18.3.rst | |
14 | release-notes-4.18.2.rst |
|
16 | release-notes-4.18.2.rst |
@@ -531,8 +531,6 b' class BaseReferencesView(RepoAppView):' | |||||
531 | """ |
|
531 | """ | |
532 | def load_default_context(self): |
|
532 | def load_default_context(self): | |
533 | c = self._get_local_tmpl_context() |
|
533 | c = self._get_local_tmpl_context() | |
534 |
|
||||
535 |
|
||||
536 | return c |
|
534 | return c | |
537 |
|
535 | |||
538 | def load_refs_context(self, ref_items, partials_template): |
|
536 | def load_refs_context(self, ref_items, partials_template): | |
@@ -562,7 +560,9 b' class BaseReferencesView(RepoAppView):' | |||||
562 | 'repo_files', |
|
560 | 'repo_files', | |
563 | repo_name=self.db_repo_name, |
|
561 | repo_name=self.db_repo_name, | |
564 | f_path=ref_name if is_svn else '', |
|
562 | f_path=ref_name if is_svn else '', | |
565 |
commit_id=commit_id |
|
563 | commit_id=commit_id, | |
|
564 | _query=dict(at=ref_name) | |||
|
565 | ) | |||
566 |
|
566 | |||
567 | else: |
|
567 | else: | |
568 | files_url = h.route_path( |
|
568 | files_url = h.route_path( | |
@@ -570,7 +570,8 b' class BaseReferencesView(RepoAppView):' | |||||
570 | repo_name=self.db_repo_name, |
|
570 | repo_name=self.db_repo_name, | |
571 | f_path=ref_name if is_svn else '', |
|
571 | f_path=ref_name if is_svn else '', | |
572 | commit_id=ref_name, |
|
572 | commit_id=ref_name, | |
573 |
_query=dict(at=ref_name) |
|
573 | _query=dict(at=ref_name) | |
|
574 | ) | |||
574 |
|
575 | |||
575 | data.append({ |
|
576 | data.append({ | |
576 | "name": _render('name', ref_name, files_url, closed), |
|
577 | "name": _render('name', ref_name, files_url, closed), |
@@ -187,6 +187,7 b' Check if we should use full-topic or min' | |||||
187 | I think something like this would be better |
|
187 | I think something like this would be better | |
188 |
|
188 | |||
189 | ```py |
|
189 | ```py | |
|
190 | // markdown renderer | |||
190 |
|
191 | |||
191 | def db(): |
|
192 | def db(): | |
192 | global connection |
|
193 | global connection | |
@@ -226,10 +227,26 b' def db():' | |||||
226 | 'comment_body': ''' |
|
227 | 'comment_body': ''' | |
227 | I like this ! |
|
228 | I like this ! | |
228 |
|
229 | |||
229 |
But please check this code |
|
230 | But please check this code | |
|
231 | ||||
|
232 | .. code-block:: javascript | |||
|
233 | ||||
|
234 | // THIS IS RST CODE | |||
|
235 | ||||
|
236 | this.createResolutionComment = function(commentId) { | |||
|
237 | // hide the trigger text | |||
|
238 | $('#resolve-comment-{0}'.format(commentId)).hide(); | |||
230 |
|
239 | |||
231 | def main(): |
|
240 | var comment = $('#comment-'+commentId); | |
232 | print 'ok' |
|
241 | var commentData = comment.data(); | |
|
242 | if (commentData.commentInline) { | |||
|
243 | this.createComment(comment, commentId) | |||
|
244 | } else { | |||
|
245 | Rhodecode.comments.createGeneralComment('general', "$placeholder", commentId) | |||
|
246 | } | |||
|
247 | ||||
|
248 | return false; | |||
|
249 | }; | |||
233 |
|
250 | |||
234 | This should work better ! |
|
251 | This should work better ! | |
235 | ''', |
|
252 | ''', |
@@ -158,7 +158,7 b' class TestHomeController(TestController)' | |||||
158 | ('Enabled', True), |
|
158 | ('Enabled', True), | |
159 | ]) |
|
159 | ]) | |
160 | def test_index_show_version(self, autologin_user, name, state): |
|
160 | def test_index_show_version(self, autologin_user, name, state): | |
161 |
version_string = 'RhodeCode |
|
161 | version_string = 'RhodeCode %s' % rhodecode.__version__ | |
162 |
|
162 | |||
163 | sett = SettingsModel().create_or_update_setting( |
|
163 | sett = SettingsModel().create_or_update_setting( | |
164 | 'show_version', state, 'bool') |
|
164 | 'show_version', state, 'bool') |
@@ -178,10 +178,10 b' class TestFilesViews(object):' | |||||
178 | commit_id='tip', f_path='/')) |
|
178 | commit_id='tip', f_path='/')) | |
179 |
|
179 | |||
180 | # make sure Files menu url is not tip but new commit |
|
180 | # make sure Files menu url is not tip but new commit | |
181 |
landing_rev = backend.repo.landing_re |
|
181 | landing_rev = backend.repo.landing_ref_name | |
182 | files_url = route_path('repo_files:default_path', |
|
182 | files_url = route_path('repo_files:default_path', | |
183 | repo_name=backend.repo_name, |
|
183 | repo_name=backend.repo_name, | |
184 | commit_id=landing_rev) |
|
184 | commit_id=landing_rev, params={'at': landing_rev}) | |
185 |
|
185 | |||
186 | assert landing_rev != 'tip' |
|
186 | assert landing_rev != 'tip' | |
187 | response.mustcontain( |
|
187 | response.mustcontain( |
@@ -125,7 +125,7 b' class RepoFilesView(RepoAppView):' | |||||
125 | self.db_repo_name, branch_name) |
|
125 | self.db_repo_name, branch_name) | |
126 | if branch_perm and branch_perm not in ['branch.push', 'branch.push_force']: |
|
126 | if branch_perm and branch_perm not in ['branch.push', 'branch.push_force']: | |
127 | message = _('Branch `{}` changes forbidden by rule {}.').format( |
|
127 | message = _('Branch `{}` changes forbidden by rule {}.').format( | |
128 | branch_name, rule) |
|
128 | h.escape(branch_name), rule) | |
129 | h.flash(message, 'warning') |
|
129 | h.flash(message, 'warning') | |
130 |
|
130 | |||
131 | if json_mode: |
|
131 | if json_mode: | |
@@ -137,7 +137,7 b' class RepoFilesView(RepoAppView):' | |||||
137 | raise HTTPFound(files_url) |
|
137 | raise HTTPFound(files_url) | |
138 |
|
138 | |||
139 | def _get_commit_and_path(self): |
|
139 | def _get_commit_and_path(self): | |
140 |
default_commit_id = self.db_repo.landing_re |
|
140 | default_commit_id = self.db_repo.landing_ref_name | |
141 | default_f_path = '/' |
|
141 | default_f_path = '/' | |
142 |
|
142 | |||
143 | commit_id = self.request.matchdict.get( |
|
143 | commit_id = self.request.matchdict.get( | |
@@ -181,8 +181,8 b' class RepoFilesView(RepoAppView):' | |||||
181 | raise HTTPFound( |
|
181 | raise HTTPFound( | |
182 | h.route_path('repo_summary', repo_name=self.db_repo_name)) |
|
182 | h.route_path('repo_summary', repo_name=self.db_repo_name)) | |
183 |
|
183 | |||
184 | except (CommitDoesNotExistError, LookupError): |
|
184 | except (CommitDoesNotExistError, LookupError) as e: | |
185 | msg = _('No such commit exists for this repository') |
|
185 | msg = _('No such commit exists for this repository. Commit: {}').format(commit_id) | |
186 | h.flash(msg, category='error') |
|
186 | h.flash(msg, category='error') | |
187 | raise HTTPNotFound() |
|
187 | raise HTTPNotFound() | |
188 | except RepositoryError as e: |
|
188 | except RepositoryError as e: | |
@@ -589,6 +589,24 b' class RepoFilesView(RepoAppView):' | |||||
589 | raise HTTPFound(compare_url) |
|
589 | raise HTTPFound(compare_url) | |
590 |
|
590 | |||
591 | @LoginRequired() |
|
591 | @LoginRequired() | |
|
592 | @view_config( | |||
|
593 | route_name='repo_files:default_commit', request_method='GET', | |||
|
594 | renderer=None) | |||
|
595 | def repo_files_default(self): | |||
|
596 | c = self.load_default_context() | |||
|
597 | ref_name = c.rhodecode_db_repo.landing_ref_name | |||
|
598 | landing_url = h.repo_files_by_ref_url( | |||
|
599 | c.rhodecode_db_repo.repo_name, | |||
|
600 | c.rhodecode_db_repo.repo_type, | |||
|
601 | f_path='', | |||
|
602 | ref_name=ref_name, | |||
|
603 | commit_id='tip', | |||
|
604 | query=dict(at=ref_name) | |||
|
605 | ) | |||
|
606 | ||||
|
607 | raise HTTPFound(landing_url) | |||
|
608 | ||||
|
609 | @LoginRequired() | |||
592 | @HasRepoPermissionAnyDecorator( |
|
610 | @HasRepoPermissionAnyDecorator( | |
593 | 'repository.read', 'repository.write', 'repository.admin') |
|
611 | 'repository.read', 'repository.write', 'repository.admin') | |
594 | @view_config( |
|
612 | @view_config( | |
@@ -598,9 +616,6 b' class RepoFilesView(RepoAppView):' | |||||
598 | route_name='repo_files:default_path', request_method='GET', |
|
616 | route_name='repo_files:default_path', request_method='GET', | |
599 | renderer=None) |
|
617 | renderer=None) | |
600 | @view_config( |
|
618 | @view_config( | |
601 | route_name='repo_files:default_commit', request_method='GET', |
|
|||
602 | renderer=None) |
|
|||
603 | @view_config( |
|
|||
604 | route_name='repo_files:rendered', request_method='GET', |
|
619 | route_name='repo_files:rendered', request_method='GET', | |
605 | renderer=None) |
|
620 | renderer=None) | |
606 | @view_config( |
|
621 | @view_config( |
@@ -138,10 +138,10 b' class RepoForksView(RepoAppView, DataGri' | |||||
138 | url_link = h.route_path( |
|
138 | url_link = h.route_path( | |
139 | 'repo_compare', |
|
139 | 'repo_compare', | |
140 | repo_name=fork.repo_name, |
|
140 | repo_name=fork.repo_name, | |
141 |
source_ref_type=self.db_repo.landing_re |
|
141 | source_ref_type=self.db_repo.landing_ref_type, | |
142 |
source_ref=self.db_repo.landing_re |
|
142 | source_ref=self.db_repo.landing_ref_name, | |
143 |
target_ref_type=self.db_repo.landing_re |
|
143 | target_ref_type=self.db_repo.landing_ref_type, | |
144 |
target_ref=self.db_repo.landing_re |
|
144 | target_ref=self.db_repo.landing_ref_name, | |
145 | _query=dict(merge=1, target_repo=f.repo_name)) |
|
145 | _query=dict(merge=1, target_repo=f.repo_name)) | |
146 | return h.link_to(_('Compare fork'), url_link, class_='btn-link') |
|
146 | return h.link_to(_('Compare fork'), url_link, class_='btn-link') | |
147 |
|
147 |
1 | NO CONTENT: modified file |
|
NO CONTENT: modified file | ||
The requested commit or file is too big and content was truncated. Show full diff |
@@ -256,23 +256,34 b' tooltip = _ToolTip()' | |||||
256 | files_icon = u'<i class="file-breadcrumb-copy tooltip icon-clipboard clipboard-action" data-clipboard-text="{}" title="Copy file path"></i>' |
|
256 | files_icon = u'<i class="file-breadcrumb-copy tooltip icon-clipboard clipboard-action" data-clipboard-text="{}" title="Copy file path"></i>' | |
257 |
|
257 | |||
258 |
|
258 | |||
259 |
def files_breadcrumbs(repo_name, commit_id, file_path, at_ref=None, |
|
259 | def files_breadcrumbs(repo_name, repo_type, commit_id, file_path, landing_ref_name=None, at_ref=None, | |
|
260 | limit_items=False, linkify_last_item=False, hide_last_item=False, | |||
|
261 | copy_path_icon=True): | |||
260 | if isinstance(file_path, str): |
|
262 | if isinstance(file_path, str): | |
261 | file_path = safe_unicode(file_path) |
|
263 | file_path = safe_unicode(file_path) | |
262 |
|
264 | |||
263 | route_qry = {'at': at_ref} if at_ref else None |
|
265 | if at_ref: | |
|
266 | route_qry = {'at': at_ref} | |||
|
267 | default_landing_ref = at_ref or landing_ref_name or commit_id | |||
|
268 | else: | |||
|
269 | route_qry = None | |||
|
270 | default_landing_ref = commit_id | |||
264 |
|
271 | |||
265 |
# first segment is a ` |
|
272 | # first segment is a `HOME` link to repo files root location | |
266 | root_name = literal(u'<i class="icon-home"></i>') |
|
273 | root_name = literal(u'<i class="icon-home"></i>') | |
|
274 | ||||
267 | url_segments = [ |
|
275 | url_segments = [ | |
268 | link_to( |
|
276 | link_to( | |
269 | root_name, |
|
277 | root_name, | |
270 | route_path( |
|
278 | repo_files_by_ref_url( | |
271 |
|
|
279 | repo_name, | |
272 |
repo_ |
|
280 | repo_type, | |
|
281 | f_path=None, # None here is a special case for SVN repos, | |||
|
282 | # that won't prefix with a ref | |||
|
283 | ref_name=default_landing_ref, | |||
273 | commit_id=commit_id, |
|
284 | commit_id=commit_id, | |
274 | f_path='', |
|
285 | query=route_qry | |
275 | _query=route_qry), |
|
286 | ) | |
276 | )] |
|
287 | )] | |
277 |
|
288 | |||
278 | path_segments = file_path.split('/') |
|
289 | path_segments = file_path.split('/') | |
@@ -284,6 +295,10 b' def files_breadcrumbs(repo_name, commit_' | |||||
284 |
|
295 | |||
285 | last_item = cnt == last_cnt |
|
296 | last_item = cnt == last_cnt | |
286 |
|
297 | |||
|
298 | if last_item and hide_last_item: | |||
|
299 | # iterate over and hide last element | |||
|
300 | continue | |||
|
301 | ||||
287 | if last_item and linkify_last_item is False: |
|
302 | if last_item and linkify_last_item is False: | |
288 | # plain version |
|
303 | # plain version | |
289 | url_segments.append(segment_html) |
|
304 | url_segments.append(segment_html) | |
@@ -291,12 +306,14 b' def files_breadcrumbs(repo_name, commit_' | |||||
291 | url_segments.append( |
|
306 | url_segments.append( | |
292 | link_to( |
|
307 | link_to( | |
293 | segment_html, |
|
308 | segment_html, | |
294 |
r |
|
309 | repo_files_by_ref_url( | |
295 |
|
|
310 | repo_name, | |
296 |
repo_ |
|
311 | repo_type, | |
|
312 | f_path='/'.join(path_segments[:cnt + 1]), | |||
|
313 | ref_name=default_landing_ref, | |||
297 | commit_id=commit_id, |
|
314 | commit_id=commit_id, | |
298 | f_path='/'.join(path_segments[:cnt + 1]), |
|
315 | query=route_qry | |
299 |
|
|
316 | ), | |
300 | )) |
|
317 | )) | |
301 |
|
318 | |||
302 | limited_url_segments = url_segments[:1] + ['...'] + url_segments[-5:] |
|
319 | limited_url_segments = url_segments[:1] + ['...'] + url_segments[-5:] | |
@@ -304,7 +321,11 b' def files_breadcrumbs(repo_name, commit_' | |||||
304 | url_segments = limited_url_segments |
|
321 | url_segments = limited_url_segments | |
305 |
|
322 | |||
306 | full_path = file_path |
|
323 | full_path = file_path | |
|
324 | if copy_path_icon: | |||
307 | icon = files_icon.format(escape(full_path)) |
|
325 | icon = files_icon.format(escape(full_path)) | |
|
326 | else: | |||
|
327 | icon = '' | |||
|
328 | ||||
308 | if file_path == '': |
|
329 | if file_path == '': | |
309 | return root_name |
|
330 | return root_name | |
310 | else: |
|
331 | else: | |
@@ -323,6 +344,54 b' def files_url_data(request):' | |||||
323 | return json.dumps(matchdict) |
|
344 | return json.dumps(matchdict) | |
324 |
|
345 | |||
325 |
|
346 | |||
|
347 | def repo_files_by_ref_url(db_repo_name, db_repo_type, f_path, ref_name, commit_id, query=None, ): | |||
|
348 | _is_svn = is_svn(db_repo_type) | |||
|
349 | final_f_path = f_path | |||
|
350 | ||||
|
351 | if _is_svn: | |||
|
352 | """ | |||
|
353 | For SVN the ref_name cannot be used as a commit_id, it needs to be prefixed with | |||
|
354 | actually commit_id followed by the ref_name. This should be done only in case | |||
|
355 | This is a initial landing url, without additional paths. | |||
|
356 | ||||
|
357 | like: /1000/tags/1.0.0/?at=tags/1.0.0 | |||
|
358 | """ | |||
|
359 | ||||
|
360 | if ref_name and ref_name != 'tip': | |||
|
361 | # NOTE(marcink): for svn the ref_name is actually the stored path, so we prefix it | |||
|
362 | # for SVN we only do this magic prefix if it's root, .eg landing revision | |||
|
363 | # of files link. If we are in the tree we don't need this since we traverse the url | |||
|
364 | # that has everything stored | |||
|
365 | if f_path in ['', '/']: | |||
|
366 | final_f_path = '/'.join([ref_name, f_path]) | |||
|
367 | ||||
|
368 | # SVN always needs a commit_id explicitly, without a named REF | |||
|
369 | default_commit_id = commit_id | |||
|
370 | else: | |||
|
371 | """ | |||
|
372 | For git and mercurial we construct a new URL using the names instead of commit_id | |||
|
373 | like: /master/some_path?at=master | |||
|
374 | """ | |||
|
375 | # We currently do not support branches with slashes | |||
|
376 | if '/' in ref_name: | |||
|
377 | default_commit_id = commit_id | |||
|
378 | else: | |||
|
379 | default_commit_id = ref_name | |||
|
380 | ||||
|
381 | # sometimes we pass f_path as None, to indicate explicit no prefix, | |||
|
382 | # we translate it to string to not have None | |||
|
383 | final_f_path = final_f_path or '' | |||
|
384 | ||||
|
385 | files_url = route_path( | |||
|
386 | 'repo_files', | |||
|
387 | repo_name=db_repo_name, | |||
|
388 | commit_id=default_commit_id, | |||
|
389 | f_path=final_f_path, | |||
|
390 | _query=query | |||
|
391 | ) | |||
|
392 | return files_url | |||
|
393 | ||||
|
394 | ||||
326 | def code_highlight(code, lexer, formatter, use_hl_filter=False): |
|
395 | def code_highlight(code, lexer, formatter, use_hl_filter=False): | |
327 | """ |
|
396 | """ | |
328 | Lex ``code`` with ``lexer`` and format it with the formatter ``formatter``. |
|
397 | Lex ``code`` with ``lexer`` and format it with the formatter ``formatter``. | |
@@ -1492,7 +1561,7 b' def _process_url_func(match_obj, repo_na' | |||||
1492 | 'id-repr': issue_id, |
|
1561 | 'id-repr': issue_id, | |
1493 | 'issue-prefix': entry['pref'], |
|
1562 | 'issue-prefix': entry['pref'], | |
1494 | 'serv': entry['url'], |
|
1563 | 'serv': entry['url'], | |
1495 | 'title': desc, |
|
1564 | 'title': bleach.clean(desc, strip=True), | |
1496 | 'hovercard_url': hovercard_url |
|
1565 | 'hovercard_url': hovercard_url | |
1497 | } |
|
1566 | } | |
1498 |
|
1567 |
@@ -99,7 +99,7 b' class VcsHttpProxy(object):' | |||||
99 | 'X-RC-Server-Config-File': self.rc_extras.get('config'), |
|
99 | 'X-RC-Server-Config-File': self.rc_extras.get('config'), | |
100 |
|
100 | |||
101 | 'X-RC-Auth-User': self.rc_extras.get('username'), |
|
101 | 'X-RC-Auth-User': self.rc_extras.get('username'), | |
102 | 'X-RC-Auth-User-Id': self.rc_extras.get('user_id'), |
|
102 | 'X-RC-Auth-User-Id': str(self.rc_extras.get('user_id')), | |
103 | 'X-RC-Auth-User-Ip': self.rc_extras.get('ip'), |
|
103 | 'X-RC-Auth-User-Ip': self.rc_extras.get('ip'), | |
104 |
|
104 | |||
105 | # TODO: johbo: Avoid encoding and put this into payload? |
|
105 | # TODO: johbo: Avoid encoding and put this into payload? |
@@ -47,7 +47,7 b' from .utils import (' | |||||
47 | FreshRegionCache, ActiveRegionCache) |
|
47 | FreshRegionCache, ActiveRegionCache) | |
48 |
|
48 | |||
49 |
|
49 | |||
50 |
FILE_TREE_CACHE_VER = 'v |
|
50 | FILE_TREE_CACHE_VER = 'v4' | |
51 |
|
51 | |||
52 |
|
52 | |||
53 | def configure_dogpile_cache(settings): |
|
53 | def configure_dogpile_cache(settings): |
@@ -1758,7 +1758,7 b' class Repository(Base, BaseModel):' | |||||
1758 |
|
1758 | |||
1759 | @hybrid_property |
|
1759 | @hybrid_property | |
1760 | def landing_rev(self): |
|
1760 | def landing_rev(self): | |
1761 | # always should return [rev_type, rev] |
|
1761 | # always should return [rev_type, rev], e.g ['branch', 'master'] | |
1762 | if self._landing_revision: |
|
1762 | if self._landing_revision: | |
1763 | _rev_info = self._landing_revision.split(':') |
|
1763 | _rev_info = self._landing_revision.split(':') | |
1764 | if len(_rev_info) < 2: |
|
1764 | if len(_rev_info) < 2: | |
@@ -1766,6 +1766,14 b' class Repository(Base, BaseModel):' | |||||
1766 | return [_rev_info[0], _rev_info[1]] |
|
1766 | return [_rev_info[0], _rev_info[1]] | |
1767 | return [None, None] |
|
1767 | return [None, None] | |
1768 |
|
1768 | |||
|
1769 | @property | |||
|
1770 | def landing_ref_type(self): | |||
|
1771 | return self.landing_rev[0] | |||
|
1772 | ||||
|
1773 | @property | |||
|
1774 | def landing_ref_name(self): | |||
|
1775 | return self.landing_rev[1] | |||
|
1776 | ||||
1769 | @landing_rev.setter |
|
1777 | @landing_rev.setter | |
1770 | def landing_rev(self, val): |
|
1778 | def landing_rev(self, val): | |
1771 | if ':' not in val: |
|
1779 | if ':' not in val: | |
@@ -4954,7 +4962,9 b' class RepoReviewRule(Base, BaseModel):' | |||||
4954 | else: |
|
4962 | else: | |
4955 | file_pattern = glob2re(self.file_pattern) |
|
4963 | file_pattern = glob2re(self.file_pattern) | |
4956 | file_regex = re.compile(file_pattern) |
|
4964 | file_regex = re.compile(file_pattern) | |
4957 |
for file |
|
4965 | for file_data in files_changed: | |
|
4966 | filename = file_data.get('filename') | |||
|
4967 | ||||
4958 | if file_regex.search(filename): |
|
4968 | if file_regex.search(filename): | |
4959 | files_matches = True |
|
4969 | files_matches = True | |
4960 | break |
|
4970 | break |
@@ -186,7 +186,7 b' def get_diff_info(' | |||||
186 | email = commit.author_email |
|
186 | email = commit.author_email | |
187 | user = User.get_from_cs_author(author) |
|
187 | user = User.get_from_cs_author(author) | |
188 | if user: |
|
188 | if user: | |
189 | user_counts[user] = user_counts.get(user, 0) + 1 |
|
189 | user_counts[user.user_id] = user_counts.get(user.user_id, 0) + 1 | |
190 | author_counts[author] = author_counts.get(author, 0) + 1 |
|
190 | author_counts[author] = author_counts.get(author, 0) + 1 | |
191 | email_counts[email] = email_counts.get(email, 0) + 1 |
|
191 | email_counts[email] = email_counts.get(email, 0) + 1 | |
192 |
|
192 |
@@ -911,6 +911,11 b' input.filediff-collapse-state {' | |||||
911 | * { |
|
911 | * { | |
912 | box-sizing: border-box; |
|
912 | box-sizing: border-box; | |
913 | } |
|
913 | } | |
|
914 | ||||
|
915 | .on-hover-icon { | |||
|
916 | visibility: hidden; | |||
|
917 | } | |||
|
918 | ||||
914 | .filediff-anchor { |
|
919 | .filediff-anchor { | |
915 | visibility: hidden; |
|
920 | visibility: hidden; | |
916 | } |
|
921 | } | |
@@ -918,6 +923,9 b' input.filediff-collapse-state {' | |||||
918 | .filediff-anchor { |
|
923 | .filediff-anchor { | |
919 | visibility: visible; |
|
924 | visibility: visible; | |
920 | } |
|
925 | } | |
|
926 | .on-hover-icon { | |||
|
927 | visibility: visible; | |||
|
928 | } | |||
921 | } |
|
929 | } | |
922 |
|
930 | |||
923 | .filediff-heading { |
|
931 | .filediff-heading { |
@@ -112,6 +112,13 b' input + .action-link, .action-link.first' | |||||
112 | cursor: inherit; |
|
112 | cursor: inherit; | |
113 | } |
|
113 | } | |
114 |
|
114 | |||
|
115 | .grey-link-action { | |||
|
116 | cursor: pointer; | |||
|
117 | &:hover { | |||
|
118 | color: @grey2; | |||
|
119 | } | |||
|
120 | color: @grey4; | |||
|
121 | } | |||
115 |
|
122 | |||
116 | .clipboard-action { |
|
123 | .clipboard-action { | |
117 | cursor: pointer; |
|
124 | cursor: pointer; |
@@ -307,7 +307,7 b'' | |||||
307 | border-radius: 0; |
|
307 | border-radius: 0; | |
308 | background: #fff; |
|
308 | background: #fff; | |
309 | font-family: inherit; |
|
309 | font-family: inherit; | |
310 |
font-size: 1 |
|
310 | font-size: 13px; | |
311 | } |
|
311 | } | |
312 |
|
312 | |||
313 | .swal2-popup:focus { |
|
313 | .swal2-popup:focus { |
@@ -6,14 +6,18 b'' | |||||
6 | //JS translations map |
|
6 | //JS translations map | |
7 | var _TM = { |
|
7 | var _TM = { | |
8 | '(from usergroup {0})': '(from usergroup {0})', |
|
8 | '(from usergroup {0})': '(from usergroup {0})', | |
|
9 | '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ', | |||
|
10 | '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ', | |||
9 | 'Add another comment': 'Add another comment', |
|
11 | 'Add another comment': 'Add another comment', | |
10 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', |
|
12 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', | |
|
13 | 'Ajax Request Error': 'Ajax Request Error', | |||
11 | 'All Authors': 'All Authors', |
|
14 | 'All Authors': 'All Authors', | |
12 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', |
|
15 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', | |
13 | 'All reviewers must vote.': 'All reviewers must vote.', |
|
16 | 'All reviewers must vote.': 'All reviewers must vote.', | |
14 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', |
|
17 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', | |
15 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', |
|
18 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', | |
16 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', |
|
19 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', | |
|
20 | 'Authentication Token': 'Authentication Token', | |||
17 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', |
|
21 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', | |
18 | 'Changed files': 'Changed files', |
|
22 | 'Changed files': 'Changed files', | |
19 | 'Close': 'Close', |
|
23 | 'Close': 'Close', | |
@@ -23,13 +27,16 b' var _TM = {' | |||||
23 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', |
|
27 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', | |
24 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', |
|
28 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', | |
25 | 'Context file: ': 'Context file: ', |
|
29 | 'Context file: ': 'Context file: ', | |
|
30 | 'Delete': 'Delete', | |||
26 | 'Delete this comment?': 'Delete this comment?', |
|
31 | 'Delete this comment?': 'Delete this comment?', | |
27 | 'Diff to Commit ': 'Diff to Commit ', |
|
32 | 'Diff to Commit ': 'Diff to Commit ', | |
|
33 | 'Error during search operation': 'Error during search operation', | |||
28 | 'Expand all files': 'Expand all files', |
|
34 | 'Expand all files': 'Expand all files', | |
29 | 'Expand {0} commit': 'Expand {0} commit', |
|
35 | 'Expand {0} commit': 'Expand {0} commit', | |
30 | 'Expand {0} commits': 'Expand {0} commits', |
|
36 | 'Expand {0} commits': 'Expand {0} commits', | |
31 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', |
|
37 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', | |
32 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', |
|
38 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', | |
|
39 | 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', | |||
33 | 'Follow': 'Follow', |
|
40 | 'Follow': 'Follow', | |
34 | 'Force updating...': 'Force updating...', |
|
41 | 'Force updating...': 'Force updating...', | |
35 | 'Hide full context diff': 'Hide full context diff', |
|
42 | 'Hide full context diff': 'Hide full context diff', | |
@@ -40,6 +47,7 b' var _TM = {' | |||||
40 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', |
|
47 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', | |
41 | 'Lifetime': 'Lifetime', |
|
48 | 'Lifetime': 'Lifetime', | |
42 | 'Loading ...': 'Loading ...', |
|
49 | 'Loading ...': 'Loading ...', | |
|
50 | 'Loading diff ...': 'Loading diff ...', | |||
43 | 'Loading failed': 'Loading failed', |
|
51 | 'Loading failed': 'Loading failed', | |
44 | 'Loading more results...': 'Loading more results...', |
|
52 | 'Loading more results...': 'Loading more results...', | |
45 | 'Loading...': 'Loading...', |
|
53 | 'Loading...': 'Loading...', | |
@@ -68,6 +76,7 b' var _TM = {' | |||||
68 | 'Please delete {0} characters': 'Please delete {0} characters', |
|
76 | 'Please delete {0} characters': 'Please delete {0} characters', | |
69 | 'Please enter {0} or more character': 'Please enter {0} or more character', |
|
77 | 'Please enter {0} or more character': 'Please enter {0} or more character', | |
70 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', |
|
78 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', | |
|
79 | 'Please wait creating pull request...': 'Please wait creating pull request...', | |||
71 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', |
|
80 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', | |
72 | 'Saving...': 'Saving...', |
|
81 | 'Saving...': 'Saving...', | |
73 | 'Searching...': 'Searching...', |
|
82 | 'Searching...': 'Searching...', | |
@@ -75,12 +84,14 b' var _TM = {' | |||||
75 | 'Send': 'Send', |
|
84 | 'Send': 'Send', | |
76 | 'Set status to Approved': 'Set status to Approved', |
|
85 | 'Set status to Approved': 'Set status to Approved', | |
77 | 'Set status to Rejected': 'Set status to Rejected', |
|
86 | 'Set status to Rejected': 'Set status to Rejected', | |
|
87 | 'Show': 'Show', | |||
78 | 'Show at Commit ': 'Show at Commit ', |
|
88 | 'Show at Commit ': 'Show at Commit ', | |
79 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', |
|
89 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', | |
80 | 'Show full context diff': 'Show full context diff', |
|
90 | 'Show full context diff': 'Show full context diff', | |
81 | 'Show more': 'Show more', |
|
91 | 'Show more': 'Show more', | |
82 | 'Show selected commit __S': 'Show selected commit __S', |
|
92 | 'Show selected commit __S': 'Show selected commit __S', | |
83 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', |
|
93 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', | |
|
94 | 'Show this authentication token?': 'Show this authentication token?', | |||
84 | 'Show whitespace changes': 'Show whitespace changes', |
|
95 | 'Show whitespace changes': 'Show whitespace changes', | |
85 | 'Specified expiration date': 'Specified expiration date', |
|
96 | 'Specified expiration date': 'Specified expiration date', | |
86 | 'Start following this repository': 'Start following this repository', |
|
97 | 'Start following this repository': 'Start following this repository', | |
@@ -94,6 +105,10 b' var _TM = {' | |||||
94 | 'TODO comment': 'TODO comment', |
|
105 | 'TODO comment': 'TODO comment', | |
95 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', |
|
106 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', | |
96 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', |
|
107 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', | |
|
108 | 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', | |||
|
109 | 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', | |||
|
110 | 'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.', | |||
|
111 | 'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.', | |||
97 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', |
|
112 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', | |
98 | 'Unfollow': 'Unfollow', |
|
113 | 'Unfollow': 'Unfollow', | |
99 | 'Unwatch': 'Unwatch', |
|
114 | 'Unwatch': 'Unwatch', | |
@@ -101,6 +116,7 b' var _TM = {' | |||||
101 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', |
|
116 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', | |
102 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', |
|
117 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', | |
103 | 'Watch': 'Watch', |
|
118 | 'Watch': 'Watch', | |
|
119 | 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', | |||
104 | 'You can only select {0} item': 'You can only select {0} item', |
|
120 | 'You can only select {0} item': 'You can only select {0} item', | |
105 | 'You can only select {0} items': 'You can only select {0} items', |
|
121 | 'You can only select {0} items': 'You can only select {0} items', | |
106 | 'activated': 'activated', |
|
122 | 'activated': 'activated', | |
@@ -117,6 +133,7 b' var _TM = {' | |||||
117 | 'just now': 'just now', |
|
133 | 'just now': 'just now', | |
118 | 'loading...': 'loading...', |
|
134 | 'loading...': 'loading...', | |
119 | 'member of "{0}"': 'member of "{0}"', |
|
135 | 'member of "{0}"': 'member of "{0}"', | |
|
136 | 'no commits': 'no commits', | |||
120 | 'not active': 'not active', |
|
137 | 'not active': 'not active', | |
121 | 'resolve comment': 'resolve comment', |
|
138 | 'resolve comment': 'resolve comment', | |
122 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
|
139 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
@@ -6,14 +6,18 b'' | |||||
6 | //JS translations map |
|
6 | //JS translations map | |
7 | var _TM = { |
|
7 | var _TM = { | |
8 | '(from usergroup {0})': '(from usergroup {0})', |
|
8 | '(from usergroup {0})': '(from usergroup {0})', | |
|
9 | '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ', | |||
|
10 | '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ', | |||
9 | 'Add another comment': 'Add another comment', |
|
11 | 'Add another comment': 'Add another comment', | |
10 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', |
|
12 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', | |
|
13 | 'Ajax Request Error': 'Ajax Request Error', | |||
11 | 'All Authors': 'All Authors', |
|
14 | 'All Authors': 'All Authors', | |
12 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', |
|
15 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', | |
13 | 'All reviewers must vote.': 'All reviewers must vote.', |
|
16 | 'All reviewers must vote.': 'All reviewers must vote.', | |
14 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', |
|
17 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', | |
15 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', |
|
18 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', | |
16 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', |
|
19 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', | |
|
20 | 'Authentication Token': 'Authentication Token', | |||
17 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', |
|
21 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', | |
18 | 'Changed files': 'Changed files', |
|
22 | 'Changed files': 'Changed files', | |
19 | 'Close': 'Close', |
|
23 | 'Close': 'Close', | |
@@ -23,13 +27,16 b' var _TM = {' | |||||
23 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', |
|
27 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', | |
24 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', |
|
28 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', | |
25 | 'Context file: ': 'Context file: ', |
|
29 | 'Context file: ': 'Context file: ', | |
|
30 | 'Delete': 'Löschen', | |||
26 | 'Delete this comment?': 'Delete this comment?', |
|
31 | 'Delete this comment?': 'Delete this comment?', | |
27 | 'Diff to Commit ': 'Diff to Commit ', |
|
32 | 'Diff to Commit ': 'Diff to Commit ', | |
|
33 | 'Error during search operation': 'Error during search operation', | |||
28 | 'Expand all files': 'Expand all files', |
|
34 | 'Expand all files': 'Expand all files', | |
29 | 'Expand {0} commit': 'Expand {0} commit', |
|
35 | 'Expand {0} commit': 'Expand {0} commit', | |
30 | 'Expand {0} commits': 'Expand {0} commits', |
|
36 | 'Expand {0} commits': 'Expand {0} commits', | |
31 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', |
|
37 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', | |
32 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', |
|
38 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', | |
|
39 | 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', | |||
33 | 'Follow': 'Follow', |
|
40 | 'Follow': 'Follow', | |
34 | 'Force updating...': 'Force updating...', |
|
41 | 'Force updating...': 'Force updating...', | |
35 | 'Hide full context diff': 'Hide full context diff', |
|
42 | 'Hide full context diff': 'Hide full context diff', | |
@@ -40,6 +47,7 b' var _TM = {' | |||||
40 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', |
|
47 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', | |
41 | 'Lifetime': 'Lebensdauer', |
|
48 | 'Lifetime': 'Lebensdauer', | |
42 | 'Loading ...': 'Loading ...', |
|
49 | 'Loading ...': 'Loading ...', | |
|
50 | 'Loading diff ...': 'Loading diff ...', | |||
43 | 'Loading failed': 'Loading failed', |
|
51 | 'Loading failed': 'Loading failed', | |
44 | 'Loading more results...': 'Loading more results...', |
|
52 | 'Loading more results...': 'Loading more results...', | |
45 | 'Loading...': 'Loading...', |
|
53 | 'Loading...': 'Loading...', | |
@@ -68,6 +76,7 b' var _TM = {' | |||||
68 | 'Please delete {0} characters': 'Bitte {0} Zeichen löschen', |
|
76 | 'Please delete {0} characters': 'Bitte {0} Zeichen löschen', | |
69 | 'Please enter {0} or more character': 'Bitte {0} oder mehr Zeichen eingeben', |
|
77 | 'Please enter {0} or more character': 'Bitte {0} oder mehr Zeichen eingeben', | |
70 | 'Please enter {0} or more characters': 'Bitte {0} oder mehr Zeichen eingeben', |
|
78 | 'Please enter {0} or more characters': 'Bitte {0} oder mehr Zeichen eingeben', | |
|
79 | 'Please wait creating pull request...': 'Please wait creating pull request...', | |||
71 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', |
|
80 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', | |
72 | 'Saving...': 'Saving...', |
|
81 | 'Saving...': 'Saving...', | |
73 | 'Searching...': 'Searching...', |
|
82 | 'Searching...': 'Searching...', | |
@@ -75,12 +84,14 b' var _TM = {' | |||||
75 | 'Send': 'Senden', |
|
84 | 'Send': 'Senden', | |
76 | 'Set status to Approved': 'Set status to Approved', |
|
85 | 'Set status to Approved': 'Set status to Approved', | |
77 | 'Set status to Rejected': 'Set status to Rejected', |
|
86 | 'Set status to Rejected': 'Set status to Rejected', | |
|
87 | 'Show': 'Show', | |||
78 | 'Show at Commit ': 'Show at Commit ', |
|
88 | 'Show at Commit ': 'Show at Commit ', | |
79 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', |
|
89 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', | |
80 | 'Show full context diff': 'Show full context diff', |
|
90 | 'Show full context diff': 'Show full context diff', | |
81 | 'Show more': 'Show more', |
|
91 | 'Show more': 'Show more', | |
82 | 'Show selected commit __S': 'Show selected commit __S', |
|
92 | 'Show selected commit __S': 'Show selected commit __S', | |
83 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', |
|
93 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', | |
|
94 | 'Show this authentication token?': 'Show this authentication token?', | |||
84 | 'Show whitespace changes': 'Show whitespace changes', |
|
95 | 'Show whitespace changes': 'Show whitespace changes', | |
85 | 'Specified expiration date': 'Specified expiration date', |
|
96 | 'Specified expiration date': 'Specified expiration date', | |
86 | 'Start following this repository': 'Start following this repository', |
|
97 | 'Start following this repository': 'Start following this repository', | |
@@ -94,6 +105,10 b' var _TM = {' | |||||
94 | 'TODO comment': 'TODO comment', |
|
105 | 'TODO comment': 'TODO comment', | |
95 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', |
|
106 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', | |
96 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', |
|
107 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', | |
|
108 | 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', | |||
|
109 | 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', | |||
|
110 | 'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.', | |||
|
111 | 'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.', | |||
97 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', |
|
112 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', | |
98 | 'Unfollow': 'Unfollow', |
|
113 | 'Unfollow': 'Unfollow', | |
99 | 'Unwatch': 'Unwatch', |
|
114 | 'Unwatch': 'Unwatch', | |
@@ -101,6 +116,7 b' var _TM = {' | |||||
101 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', |
|
116 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', | |
102 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', |
|
117 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', | |
103 | 'Watch': 'Watch', |
|
118 | 'Watch': 'Watch', | |
|
119 | 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', | |||
104 | 'You can only select {0} item': 'You can only select {0} item', |
|
120 | 'You can only select {0} item': 'You can only select {0} item', | |
105 | 'You can only select {0} items': 'You can only select {0} items', |
|
121 | 'You can only select {0} items': 'You can only select {0} items', | |
106 | 'activated': 'activated', |
|
122 | 'activated': 'activated', | |
@@ -117,6 +133,7 b' var _TM = {' | |||||
117 | 'just now': 'jetzt gerade', |
|
133 | 'just now': 'jetzt gerade', | |
118 | 'loading...': 'loading...', |
|
134 | 'loading...': 'loading...', | |
119 | 'member of "{0}"': 'member of "{0}"', |
|
135 | 'member of "{0}"': 'member of "{0}"', | |
|
136 | 'no commits': 'no commits', | |||
120 | 'not active': 'not active', |
|
137 | 'not active': 'not active', | |
121 | 'resolve comment': 'resolve comment', |
|
138 | 'resolve comment': 'resolve comment', | |
122 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
|
139 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
@@ -6,14 +6,18 b'' | |||||
6 | //JS translations map |
|
6 | //JS translations map | |
7 | var _TM = { |
|
7 | var _TM = { | |
8 | '(from usergroup {0})': '(from usergroup {0})', |
|
8 | '(from usergroup {0})': '(from usergroup {0})', | |
|
9 | '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ', | |||
|
10 | '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ', | |||
9 | 'Add another comment': 'Add another comment', |
|
11 | 'Add another comment': 'Add another comment', | |
10 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', |
|
12 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', | |
|
13 | 'Ajax Request Error': 'Ajax Request Error', | |||
11 | 'All Authors': 'All Authors', |
|
14 | 'All Authors': 'All Authors', | |
12 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', |
|
15 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', | |
13 | 'All reviewers must vote.': 'All reviewers must vote.', |
|
16 | 'All reviewers must vote.': 'All reviewers must vote.', | |
14 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', |
|
17 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', | |
15 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', |
|
18 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', | |
16 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', |
|
19 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', | |
|
20 | 'Authentication Token': 'Authentication Token', | |||
17 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', |
|
21 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', | |
18 | 'Changed files': 'Changed files', |
|
22 | 'Changed files': 'Changed files', | |
19 | 'Close': 'Close', |
|
23 | 'Close': 'Close', | |
@@ -23,13 +27,16 b' var _TM = {' | |||||
23 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', |
|
27 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', | |
24 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', |
|
28 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', | |
25 | 'Context file: ': 'Context file: ', |
|
29 | 'Context file: ': 'Context file: ', | |
|
30 | 'Delete': 'Delete', | |||
26 | 'Delete this comment?': 'Delete this comment?', |
|
31 | 'Delete this comment?': 'Delete this comment?', | |
27 | 'Diff to Commit ': 'Diff to Commit ', |
|
32 | 'Diff to Commit ': 'Diff to Commit ', | |
|
33 | 'Error during search operation': 'Error during search operation', | |||
28 | 'Expand all files': 'Expand all files', |
|
34 | 'Expand all files': 'Expand all files', | |
29 | 'Expand {0} commit': 'Expand {0} commit', |
|
35 | 'Expand {0} commit': 'Expand {0} commit', | |
30 | 'Expand {0} commits': 'Expand {0} commits', |
|
36 | 'Expand {0} commits': 'Expand {0} commits', | |
31 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', |
|
37 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', | |
32 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', |
|
38 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', | |
|
39 | 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', | |||
33 | 'Follow': 'Follow', |
|
40 | 'Follow': 'Follow', | |
34 | 'Force updating...': 'Force updating...', |
|
41 | 'Force updating...': 'Force updating...', | |
35 | 'Hide full context diff': 'Hide full context diff', |
|
42 | 'Hide full context diff': 'Hide full context diff', | |
@@ -40,6 +47,7 b' var _TM = {' | |||||
40 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', |
|
47 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', | |
41 | 'Lifetime': 'Lifetime', |
|
48 | 'Lifetime': 'Lifetime', | |
42 | 'Loading ...': 'Loading ...', |
|
49 | 'Loading ...': 'Loading ...', | |
|
50 | 'Loading diff ...': 'Loading diff ...', | |||
43 | 'Loading failed': 'Loading failed', |
|
51 | 'Loading failed': 'Loading failed', | |
44 | 'Loading more results...': 'Loading more results...', |
|
52 | 'Loading more results...': 'Loading more results...', | |
45 | 'Loading...': 'Loading...', |
|
53 | 'Loading...': 'Loading...', | |
@@ -68,6 +76,7 b' var _TM = {' | |||||
68 | 'Please delete {0} characters': 'Please delete {0} characters', |
|
76 | 'Please delete {0} characters': 'Please delete {0} characters', | |
69 | 'Please enter {0} or more character': 'Please enter {0} or more character', |
|
77 | 'Please enter {0} or more character': 'Please enter {0} or more character', | |
70 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', |
|
78 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', | |
|
79 | 'Please wait creating pull request...': 'Please wait creating pull request...', | |||
71 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', |
|
80 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', | |
72 | 'Saving...': 'Saving...', |
|
81 | 'Saving...': 'Saving...', | |
73 | 'Searching...': 'Searching...', |
|
82 | 'Searching...': 'Searching...', | |
@@ -75,12 +84,14 b' var _TM = {' | |||||
75 | 'Send': 'Send', |
|
84 | 'Send': 'Send', | |
76 | 'Set status to Approved': 'Set status to Approved', |
|
85 | 'Set status to Approved': 'Set status to Approved', | |
77 | 'Set status to Rejected': 'Set status to Rejected', |
|
86 | 'Set status to Rejected': 'Set status to Rejected', | |
|
87 | 'Show': 'Show', | |||
78 | 'Show at Commit ': 'Show at Commit ', |
|
88 | 'Show at Commit ': 'Show at Commit ', | |
79 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', |
|
89 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', | |
80 | 'Show full context diff': 'Show full context diff', |
|
90 | 'Show full context diff': 'Show full context diff', | |
81 | 'Show more': 'Show more', |
|
91 | 'Show more': 'Show more', | |
82 | 'Show selected commit __S': 'Show selected commit __S', |
|
92 | 'Show selected commit __S': 'Show selected commit __S', | |
83 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', |
|
93 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', | |
|
94 | 'Show this authentication token?': 'Show this authentication token?', | |||
84 | 'Show whitespace changes': 'Show whitespace changes', |
|
95 | 'Show whitespace changes': 'Show whitespace changes', | |
85 | 'Specified expiration date': 'Specified expiration date', |
|
96 | 'Specified expiration date': 'Specified expiration date', | |
86 | 'Start following this repository': 'Start following this repository', |
|
97 | 'Start following this repository': 'Start following this repository', | |
@@ -94,6 +105,10 b' var _TM = {' | |||||
94 | 'TODO comment': 'TODO comment', |
|
105 | 'TODO comment': 'TODO comment', | |
95 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', |
|
106 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', | |
96 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', |
|
107 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', | |
|
108 | 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', | |||
|
109 | 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', | |||
|
110 | 'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.', | |||
|
111 | 'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.', | |||
97 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', |
|
112 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', | |
98 | 'Unfollow': 'Unfollow', |
|
113 | 'Unfollow': 'Unfollow', | |
99 | 'Unwatch': 'Unwatch', |
|
114 | 'Unwatch': 'Unwatch', | |
@@ -101,6 +116,7 b' var _TM = {' | |||||
101 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', |
|
116 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', | |
102 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', |
|
117 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', | |
103 | 'Watch': 'Watch', |
|
118 | 'Watch': 'Watch', | |
|
119 | 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', | |||
104 | 'You can only select {0} item': 'You can only select {0} item', |
|
120 | 'You can only select {0} item': 'You can only select {0} item', | |
105 | 'You can only select {0} items': 'You can only select {0} items', |
|
121 | 'You can only select {0} items': 'You can only select {0} items', | |
106 | 'activated': 'activated', |
|
122 | 'activated': 'activated', | |
@@ -117,6 +133,7 b' var _TM = {' | |||||
117 | 'just now': 'just now', |
|
133 | 'just now': 'just now', | |
118 | 'loading...': 'loading...', |
|
134 | 'loading...': 'loading...', | |
119 | 'member of "{0}"': 'member of "{0}"', |
|
135 | 'member of "{0}"': 'member of "{0}"', | |
|
136 | 'no commits': 'no commits', | |||
120 | 'not active': 'not active', |
|
137 | 'not active': 'not active', | |
121 | 'resolve comment': 'resolve comment', |
|
138 | 'resolve comment': 'resolve comment', | |
122 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
|
139 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
@@ -6,14 +6,18 b'' | |||||
6 | //JS translations map |
|
6 | //JS translations map | |
7 | var _TM = { |
|
7 | var _TM = { | |
8 | '(from usergroup {0})': '(from usergroup {0})', |
|
8 | '(from usergroup {0})': '(from usergroup {0})', | |
|
9 | '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ', | |||
|
10 | '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ', | |||
9 | 'Add another comment': 'Add another comment', |
|
11 | 'Add another comment': 'Add another comment', | |
10 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', |
|
12 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', | |
|
13 | 'Ajax Request Error': 'Ajax Request Error', | |||
11 | 'All Authors': 'All Authors', |
|
14 | 'All Authors': 'All Authors', | |
12 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', |
|
15 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', | |
13 | 'All reviewers must vote.': 'All reviewers must vote.', |
|
16 | 'All reviewers must vote.': 'All reviewers must vote.', | |
14 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', |
|
17 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', | |
15 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', |
|
18 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', | |
16 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', |
|
19 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', | |
|
20 | 'Authentication Token': 'Authentication Token', | |||
17 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', |
|
21 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', | |
18 | 'Changed files': 'Changed files', |
|
22 | 'Changed files': 'Changed files', | |
19 | 'Close': 'Close', |
|
23 | 'Close': 'Close', | |
@@ -23,13 +27,16 b' var _TM = {' | |||||
23 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', |
|
27 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', | |
24 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', |
|
28 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', | |
25 | 'Context file: ': 'Context file: ', |
|
29 | 'Context file: ': 'Context file: ', | |
|
30 | 'Delete': 'Delete', | |||
26 | 'Delete this comment?': 'Delete this comment?', |
|
31 | 'Delete this comment?': 'Delete this comment?', | |
27 | 'Diff to Commit ': 'Diff to Commit ', |
|
32 | 'Diff to Commit ': 'Diff to Commit ', | |
|
33 | 'Error during search operation': 'Error during search operation', | |||
28 | 'Expand all files': 'Expand all files', |
|
34 | 'Expand all files': 'Expand all files', | |
29 | 'Expand {0} commit': 'Expand {0} commit', |
|
35 | 'Expand {0} commit': 'Expand {0} commit', | |
30 | 'Expand {0} commits': 'Expand {0} commits', |
|
36 | 'Expand {0} commits': 'Expand {0} commits', | |
31 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', |
|
37 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', | |
32 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', |
|
38 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', | |
|
39 | 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', | |||
33 | 'Follow': 'Follow', |
|
40 | 'Follow': 'Follow', | |
34 | 'Force updating...': 'Force updating...', |
|
41 | 'Force updating...': 'Force updating...', | |
35 | 'Hide full context diff': 'Hide full context diff', |
|
42 | 'Hide full context diff': 'Hide full context diff', | |
@@ -40,6 +47,7 b' var _TM = {' | |||||
40 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', |
|
47 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', | |
41 | 'Lifetime': 'De por vida', |
|
48 | 'Lifetime': 'De por vida', | |
42 | 'Loading ...': 'Loading ...', |
|
49 | 'Loading ...': 'Loading ...', | |
|
50 | 'Loading diff ...': 'Loading diff ...', | |||
43 | 'Loading failed': 'Loading failed', |
|
51 | 'Loading failed': 'Loading failed', | |
44 | 'Loading more results...': 'Loading more results...', |
|
52 | 'Loading more results...': 'Loading more results...', | |
45 | 'Loading...': 'Loading...', |
|
53 | 'Loading...': 'Loading...', | |
@@ -68,6 +76,7 b' var _TM = {' | |||||
68 | 'Please delete {0} characters': 'Please delete {0} characters', |
|
76 | 'Please delete {0} characters': 'Please delete {0} characters', | |
69 | 'Please enter {0} or more character': 'Please enter {0} or more character', |
|
77 | 'Please enter {0} or more character': 'Please enter {0} or more character', | |
70 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', |
|
78 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', | |
|
79 | 'Please wait creating pull request...': 'Please wait creating pull request...', | |||
71 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', |
|
80 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', | |
72 | 'Saving...': 'Saving...', |
|
81 | 'Saving...': 'Saving...', | |
73 | 'Searching...': 'Searching...', |
|
82 | 'Searching...': 'Searching...', | |
@@ -75,12 +84,14 b' var _TM = {' | |||||
75 | 'Send': 'Send', |
|
84 | 'Send': 'Send', | |
76 | 'Set status to Approved': 'Set status to Approved', |
|
85 | 'Set status to Approved': 'Set status to Approved', | |
77 | 'Set status to Rejected': 'Set status to Rejected', |
|
86 | 'Set status to Rejected': 'Set status to Rejected', | |
|
87 | 'Show': 'Show', | |||
78 | 'Show at Commit ': 'Show at Commit ', |
|
88 | 'Show at Commit ': 'Show at Commit ', | |
79 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', |
|
89 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', | |
80 | 'Show full context diff': 'Show full context diff', |
|
90 | 'Show full context diff': 'Show full context diff', | |
81 | 'Show more': 'Show more', |
|
91 | 'Show more': 'Show more', | |
82 | 'Show selected commit __S': 'Show selected commit __S', |
|
92 | 'Show selected commit __S': 'Show selected commit __S', | |
83 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', |
|
93 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', | |
|
94 | 'Show this authentication token?': 'Show this authentication token?', | |||
84 | 'Show whitespace changes': 'Show whitespace changes', |
|
95 | 'Show whitespace changes': 'Show whitespace changes', | |
85 | 'Specified expiration date': 'Specified expiration date', |
|
96 | 'Specified expiration date': 'Specified expiration date', | |
86 | 'Start following this repository': 'Start following this repository', |
|
97 | 'Start following this repository': 'Start following this repository', | |
@@ -94,6 +105,10 b' var _TM = {' | |||||
94 | 'TODO comment': 'TODO comment', |
|
105 | 'TODO comment': 'TODO comment', | |
95 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', |
|
106 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', | |
96 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', |
|
107 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', | |
|
108 | 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', | |||
|
109 | 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', | |||
|
110 | 'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.', | |||
|
111 | 'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.', | |||
97 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', |
|
112 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', | |
98 | 'Unfollow': 'Unfollow', |
|
113 | 'Unfollow': 'Unfollow', | |
99 | 'Unwatch': 'Unwatch', |
|
114 | 'Unwatch': 'Unwatch', | |
@@ -101,6 +116,7 b' var _TM = {' | |||||
101 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', |
|
116 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', | |
102 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', |
|
117 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', | |
103 | 'Watch': 'Watch', |
|
118 | 'Watch': 'Watch', | |
|
119 | 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', | |||
104 | 'You can only select {0} item': 'You can only select {0} item', |
|
120 | 'You can only select {0} item': 'You can only select {0} item', | |
105 | 'You can only select {0} items': 'You can only select {0} items', |
|
121 | 'You can only select {0} items': 'You can only select {0} items', | |
106 | 'activated': 'activated', |
|
122 | 'activated': 'activated', | |
@@ -117,6 +133,7 b' var _TM = {' | |||||
117 | 'just now': 'just now', |
|
133 | 'just now': 'just now', | |
118 | 'loading...': 'loading...', |
|
134 | 'loading...': 'loading...', | |
119 | 'member of "{0}"': 'member of "{0}"', |
|
135 | 'member of "{0}"': 'member of "{0}"', | |
|
136 | 'no commits': 'no commits', | |||
120 | 'not active': 'not active', |
|
137 | 'not active': 'not active', | |
121 | 'resolve comment': 'resolve comment', |
|
138 | 'resolve comment': 'resolve comment', | |
122 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
|
139 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
@@ -6,14 +6,18 b'' | |||||
6 | //JS translations map |
|
6 | //JS translations map | |
7 | var _TM = { |
|
7 | var _TM = { | |
8 | '(from usergroup {0})': '(from usergroup {0})', |
|
8 | '(from usergroup {0})': '(from usergroup {0})', | |
|
9 | '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ', | |||
|
10 | '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ', | |||
9 | 'Add another comment': 'Add another comment', |
|
11 | 'Add another comment': 'Add another comment', | |
10 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', |
|
12 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', | |
|
13 | 'Ajax Request Error': 'Ajax Request Error', | |||
11 | 'All Authors': 'All Authors', |
|
14 | 'All Authors': 'All Authors', | |
12 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', |
|
15 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', | |
13 | 'All reviewers must vote.': 'All reviewers must vote.', |
|
16 | 'All reviewers must vote.': 'All reviewers must vote.', | |
14 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', |
|
17 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', | |
15 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', |
|
18 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', | |
16 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', |
|
19 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', | |
|
20 | 'Authentication Token': 'Authentication Token', | |||
17 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', |
|
21 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', | |
18 | 'Changed files': 'Changed files', |
|
22 | 'Changed files': 'Changed files', | |
19 | 'Close': 'Close', |
|
23 | 'Close': 'Close', | |
@@ -23,13 +27,16 b' var _TM = {' | |||||
23 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', |
|
27 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', | |
24 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', |
|
28 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', | |
25 | 'Context file: ': 'Context file: ', |
|
29 | 'Context file: ': 'Context file: ', | |
|
30 | 'Delete': 'Supprimer', | |||
26 | 'Delete this comment?': 'Delete this comment?', |
|
31 | 'Delete this comment?': 'Delete this comment?', | |
27 | 'Diff to Commit ': 'Diff to Commit ', |
|
32 | 'Diff to Commit ': 'Diff to Commit ', | |
|
33 | 'Error during search operation': 'Error during search operation', | |||
28 | 'Expand all files': 'Expand all files', |
|
34 | 'Expand all files': 'Expand all files', | |
29 | 'Expand {0} commit': 'Expand {0} commit', |
|
35 | 'Expand {0} commit': 'Expand {0} commit', | |
30 | 'Expand {0} commits': 'Expand {0} commits', |
|
36 | 'Expand {0} commits': 'Expand {0} commits', | |
31 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', |
|
37 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', | |
32 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', |
|
38 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', | |
|
39 | 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', | |||
33 | 'Follow': 'Follow', |
|
40 | 'Follow': 'Follow', | |
34 | 'Force updating...': 'Force updating...', |
|
41 | 'Force updating...': 'Force updating...', | |
35 | 'Hide full context diff': 'Hide full context diff', |
|
42 | 'Hide full context diff': 'Hide full context diff', | |
@@ -40,6 +47,7 b' var _TM = {' | |||||
40 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', |
|
47 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', | |
41 | 'Lifetime': 'Durée de vie', |
|
48 | 'Lifetime': 'Durée de vie', | |
42 | 'Loading ...': 'Loading ...', |
|
49 | 'Loading ...': 'Loading ...', | |
|
50 | 'Loading diff ...': 'Loading diff ...', | |||
43 | 'Loading failed': 'Loading failed', |
|
51 | 'Loading failed': 'Loading failed', | |
44 | 'Loading more results...': 'Loading more results...', |
|
52 | 'Loading more results...': 'Loading more results...', | |
45 | 'Loading...': 'Loading...', |
|
53 | 'Loading...': 'Loading...', | |
@@ -68,6 +76,7 b' var _TM = {' | |||||
68 | 'Please delete {0} characters': 'Please delete {0} characters', |
|
76 | 'Please delete {0} characters': 'Please delete {0} characters', | |
69 | 'Please enter {0} or more character': 'Please enter {0} or more character', |
|
77 | 'Please enter {0} or more character': 'Please enter {0} or more character', | |
70 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', |
|
78 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', | |
|
79 | 'Please wait creating pull request...': 'Please wait creating pull request...', | |||
71 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', |
|
80 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', | |
72 | 'Saving...': 'Saving...', |
|
81 | 'Saving...': 'Saving...', | |
73 | 'Searching...': 'Searching...', |
|
82 | 'Searching...': 'Searching...', | |
@@ -75,12 +84,14 b' var _TM = {' | |||||
75 | 'Send': 'Envoyer', |
|
84 | 'Send': 'Envoyer', | |
76 | 'Set status to Approved': 'Set status to Approved', |
|
85 | 'Set status to Approved': 'Set status to Approved', | |
77 | 'Set status to Rejected': 'Set status to Rejected', |
|
86 | 'Set status to Rejected': 'Set status to Rejected', | |
|
87 | 'Show': 'Show', | |||
78 | 'Show at Commit ': 'Show at Commit ', |
|
88 | 'Show at Commit ': 'Show at Commit ', | |
79 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', |
|
89 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', | |
80 | 'Show full context diff': 'Show full context diff', |
|
90 | 'Show full context diff': 'Show full context diff', | |
81 | 'Show more': 'Show more', |
|
91 | 'Show more': 'Show more', | |
82 | 'Show selected commit __S': 'Show selected commit __S', |
|
92 | 'Show selected commit __S': 'Show selected commit __S', | |
83 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', |
|
93 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', | |
|
94 | 'Show this authentication token?': 'Show this authentication token?', | |||
84 | 'Show whitespace changes': 'Show whitespace changes', |
|
95 | 'Show whitespace changes': 'Show whitespace changes', | |
85 | 'Specified expiration date': 'Specified expiration date', |
|
96 | 'Specified expiration date': 'Specified expiration date', | |
86 | 'Start following this repository': 'Suivre ce dépôt', |
|
97 | 'Start following this repository': 'Suivre ce dépôt', | |
@@ -94,6 +105,10 b' var _TM = {' | |||||
94 | 'TODO comment': 'TODO comment', |
|
105 | 'TODO comment': 'TODO comment', | |
95 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', |
|
106 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', | |
96 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', |
|
107 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', | |
|
108 | 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', | |||
|
109 | 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', | |||
|
110 | 'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.', | |||
|
111 | 'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.', | |||
97 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', |
|
112 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', | |
98 | 'Unfollow': 'Unfollow', |
|
113 | 'Unfollow': 'Unfollow', | |
99 | 'Unwatch': 'Unwatch', |
|
114 | 'Unwatch': 'Unwatch', | |
@@ -101,6 +116,7 b' var _TM = {' | |||||
101 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', |
|
116 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', | |
102 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', |
|
117 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', | |
103 | 'Watch': 'Watch', |
|
118 | 'Watch': 'Watch', | |
|
119 | 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', | |||
104 | 'You can only select {0} item': 'You can only select {0} item', |
|
120 | 'You can only select {0} item': 'You can only select {0} item', | |
105 | 'You can only select {0} items': 'You can only select {0} items', |
|
121 | 'You can only select {0} items': 'You can only select {0} items', | |
106 | 'activated': 'activated', |
|
122 | 'activated': 'activated', | |
@@ -117,6 +133,7 b' var _TM = {' | |||||
117 | 'just now': 'à l’instant', |
|
133 | 'just now': 'à l’instant', | |
118 | 'loading...': 'Chargement…', |
|
134 | 'loading...': 'Chargement…', | |
119 | 'member of "{0}"': 'member of "{0}"', |
|
135 | 'member of "{0}"': 'member of "{0}"', | |
|
136 | 'no commits': 'no commits', | |||
120 | 'not active': 'not active', |
|
137 | 'not active': 'not active', | |
121 | 'resolve comment': 'resolve comment', |
|
138 | 'resolve comment': 'resolve comment', | |
122 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
|
139 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
@@ -6,14 +6,18 b'' | |||||
6 | //JS translations map |
|
6 | //JS translations map | |
7 | var _TM = { |
|
7 | var _TM = { | |
8 | '(from usergroup {0})': '(from usergroup {0})', |
|
8 | '(from usergroup {0})': '(from usergroup {0})', | |
|
9 | '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ', | |||
|
10 | '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ', | |||
9 | 'Add another comment': 'Aggiungi un altro commento', |
|
11 | 'Add another comment': 'Aggiungi un altro commento', | |
10 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', |
|
12 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', | |
|
13 | 'Ajax Request Error': 'Ajax Request Error', | |||
11 | 'All Authors': 'All Authors', |
|
14 | 'All Authors': 'All Authors', | |
12 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', |
|
15 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', | |
13 | 'All reviewers must vote.': 'All reviewers must vote.', |
|
16 | 'All reviewers must vote.': 'All reviewers must vote.', | |
14 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', |
|
17 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', | |
15 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', |
|
18 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', | |
16 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', |
|
19 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', | |
|
20 | 'Authentication Token': 'Authentication Token', | |||
17 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', |
|
21 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', | |
18 | 'Changed files': 'Changed files', |
|
22 | 'Changed files': 'Changed files', | |
19 | 'Close': 'Close', |
|
23 | 'Close': 'Close', | |
@@ -23,13 +27,16 b' var _TM = {' | |||||
23 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', |
|
27 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', | |
24 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', |
|
28 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', | |
25 | 'Context file: ': 'Context file: ', |
|
29 | 'Context file: ': 'Context file: ', | |
|
30 | 'Delete': 'Elimina', | |||
26 | 'Delete this comment?': 'Delete this comment?', |
|
31 | 'Delete this comment?': 'Delete this comment?', | |
27 | 'Diff to Commit ': 'Diff to Commit ', |
|
32 | 'Diff to Commit ': 'Diff to Commit ', | |
|
33 | 'Error during search operation': 'Error during search operation', | |||
28 | 'Expand all files': 'Expand all files', |
|
34 | 'Expand all files': 'Expand all files', | |
29 | 'Expand {0} commit': 'Expand {0} commit', |
|
35 | 'Expand {0} commit': 'Expand {0} commit', | |
30 | 'Expand {0} commits': 'Expand {0} commits', |
|
36 | 'Expand {0} commits': 'Expand {0} commits', | |
31 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', |
|
37 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', | |
32 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', |
|
38 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', | |
|
39 | 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', | |||
33 | 'Follow': 'Segui', |
|
40 | 'Follow': 'Segui', | |
34 | 'Force updating...': 'Force updating...', |
|
41 | 'Force updating...': 'Force updating...', | |
35 | 'Hide full context diff': 'Hide full context diff', |
|
42 | 'Hide full context diff': 'Hide full context diff', | |
@@ -40,6 +47,7 b' var _TM = {' | |||||
40 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', |
|
47 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', | |
41 | 'Lifetime': 'a vita', |
|
48 | 'Lifetime': 'a vita', | |
42 | 'Loading ...': 'Caricamento ...', |
|
49 | 'Loading ...': 'Caricamento ...', | |
|
50 | 'Loading diff ...': 'Loading diff ...', | |||
43 | 'Loading failed': 'Loading failed', |
|
51 | 'Loading failed': 'Loading failed', | |
44 | 'Loading more results...': 'Loading more results...', |
|
52 | 'Loading more results...': 'Loading more results...', | |
45 | 'Loading...': 'Loading...', |
|
53 | 'Loading...': 'Loading...', | |
@@ -68,6 +76,7 b' var _TM = {' | |||||
68 | 'Please delete {0} characters': 'Please delete {0} characters', |
|
76 | 'Please delete {0} characters': 'Please delete {0} characters', | |
69 | 'Please enter {0} or more character': 'Please enter {0} or more character', |
|
77 | 'Please enter {0} or more character': 'Please enter {0} or more character', | |
70 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', |
|
78 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', | |
|
79 | 'Please wait creating pull request...': 'Please wait creating pull request...', | |||
71 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', |
|
80 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', | |
72 | 'Saving...': 'Saving...', |
|
81 | 'Saving...': 'Saving...', | |
73 | 'Searching...': 'Searching...', |
|
82 | 'Searching...': 'Searching...', | |
@@ -75,12 +84,14 b' var _TM = {' | |||||
75 | 'Send': 'Invia', |
|
84 | 'Send': 'Invia', | |
76 | 'Set status to Approved': 'Set status to Approved', |
|
85 | 'Set status to Approved': 'Set status to Approved', | |
77 | 'Set status to Rejected': 'Set status to Rejected', |
|
86 | 'Set status to Rejected': 'Set status to Rejected', | |
|
87 | 'Show': 'Show', | |||
78 | 'Show at Commit ': 'Show at Commit ', |
|
88 | 'Show at Commit ': 'Show at Commit ', | |
79 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', |
|
89 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', | |
80 | 'Show full context diff': 'Show full context diff', |
|
90 | 'Show full context diff': 'Show full context diff', | |
81 | 'Show more': 'Mostra ancora', |
|
91 | 'Show more': 'Mostra ancora', | |
82 | 'Show selected commit __S': 'Show selected commit __S', |
|
92 | 'Show selected commit __S': 'Show selected commit __S', | |
83 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', |
|
93 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', | |
|
94 | 'Show this authentication token?': 'Show this authentication token?', | |||
84 | 'Show whitespace changes': 'Show whitespace changes', |
|
95 | 'Show whitespace changes': 'Show whitespace changes', | |
85 | 'Specified expiration date': 'Specified expiration date', |
|
96 | 'Specified expiration date': 'Specified expiration date', | |
86 | 'Start following this repository': 'Inizia a seguire il repository', |
|
97 | 'Start following this repository': 'Inizia a seguire il repository', | |
@@ -94,6 +105,10 b' var _TM = {' | |||||
94 | 'TODO comment': 'TODO comment', |
|
105 | 'TODO comment': 'TODO comment', | |
95 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', |
|
106 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', | |
96 | 'There are currently no open pull requests requiring your participation.': 'Al momento non ci sono richieste di PULL che richiedono il tuo intervento', |
|
107 | 'There are currently no open pull requests requiring your participation.': 'Al momento non ci sono richieste di PULL che richiedono il tuo intervento', | |
|
108 | 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', | |||
|
109 | 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', | |||
|
110 | 'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.', | |||
|
111 | 'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.', | |||
97 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', |
|
112 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', | |
98 | 'Unfollow': 'Smetti di seguire', |
|
113 | 'Unfollow': 'Smetti di seguire', | |
99 | 'Unwatch': 'Unwatch', |
|
114 | 'Unwatch': 'Unwatch', | |
@@ -101,6 +116,7 b' var _TM = {' | |||||
101 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', |
|
116 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', | |
102 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', |
|
117 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', | |
103 | 'Watch': 'Watch', |
|
118 | 'Watch': 'Watch', | |
|
119 | 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', | |||
104 | 'You can only select {0} item': 'You can only select {0} item', |
|
120 | 'You can only select {0} item': 'You can only select {0} item', | |
105 | 'You can only select {0} items': 'You can only select {0} items', |
|
121 | 'You can only select {0} items': 'You can only select {0} items', | |
106 | 'activated': 'activated', |
|
122 | 'activated': 'activated', | |
@@ -117,6 +133,7 b' var _TM = {' | |||||
117 | 'just now': 'proprio ora', |
|
133 | 'just now': 'proprio ora', | |
118 | 'loading...': 'loading...', |
|
134 | 'loading...': 'loading...', | |
119 | 'member of "{0}"': 'member of "{0}"', |
|
135 | 'member of "{0}"': 'member of "{0}"', | |
|
136 | 'no commits': 'no commits', | |||
120 | 'not active': 'not active', |
|
137 | 'not active': 'not active', | |
121 | 'resolve comment': 'resolve comment', |
|
138 | 'resolve comment': 'resolve comment', | |
122 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
|
139 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
@@ -6,14 +6,18 b'' | |||||
6 | //JS translations map |
|
6 | //JS translations map | |
7 | var _TM = { |
|
7 | var _TM = { | |
8 | '(from usergroup {0})': '(from usergroup {0})', |
|
8 | '(from usergroup {0})': '(from usergroup {0})', | |
|
9 | '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ', | |||
|
10 | '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ', | |||
9 | 'Add another comment': '別のコメントを追加', |
|
11 | 'Add another comment': '別のコメントを追加', | |
10 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', |
|
12 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', | |
|
13 | 'Ajax Request Error': 'Ajax Request Error', | |||
11 | 'All Authors': 'All Authors', |
|
14 | 'All Authors': 'All Authors', | |
12 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', |
|
15 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', | |
13 | 'All reviewers must vote.': 'All reviewers must vote.', |
|
16 | 'All reviewers must vote.': 'All reviewers must vote.', | |
14 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', |
|
17 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', | |
15 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', |
|
18 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', | |
16 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', |
|
19 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', | |
|
20 | 'Authentication Token': 'Authentication Token', | |||
17 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', |
|
21 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', | |
18 | 'Changed files': 'Changed files', |
|
22 | 'Changed files': 'Changed files', | |
19 | 'Close': 'Close', |
|
23 | 'Close': 'Close', | |
@@ -23,13 +27,16 b' var _TM = {' | |||||
23 | 'Comment text will be set automatically based on currently selected status ({0}) ...': '選択したステータス ({0}) を元にコメントが自動的に設定されます...', |
|
27 | 'Comment text will be set automatically based on currently selected status ({0}) ...': '選択したステータス ({0}) を元にコメントが自動的に設定されます...', | |
24 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', |
|
28 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', | |
25 | 'Context file: ': 'Context file: ', |
|
29 | 'Context file: ': 'Context file: ', | |
|
30 | 'Delete': '削除', | |||
26 | 'Delete this comment?': 'Delete this comment?', |
|
31 | 'Delete this comment?': 'Delete this comment?', | |
27 | 'Diff to Commit ': 'Diff to Commit ', |
|
32 | 'Diff to Commit ': 'Diff to Commit ', | |
|
33 | 'Error during search operation': 'Error during search operation', | |||
28 | 'Expand all files': 'Expand all files', |
|
34 | 'Expand all files': 'Expand all files', | |
29 | 'Expand {0} commit': 'Expand {0} commit', |
|
35 | 'Expand {0} commit': 'Expand {0} commit', | |
30 | 'Expand {0} commits': 'Expand {0} commits', |
|
36 | 'Expand {0} commits': 'Expand {0} commits', | |
31 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', |
|
37 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', | |
32 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', |
|
38 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', | |
|
39 | 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', | |||
33 | 'Follow': 'フォロー', |
|
40 | 'Follow': 'フォロー', | |
34 | 'Force updating...': 'Force updating...', |
|
41 | 'Force updating...': 'Force updating...', | |
35 | 'Hide full context diff': 'Hide full context diff', |
|
42 | 'Hide full context diff': 'Hide full context diff', | |
@@ -40,6 +47,7 b' var _TM = {' | |||||
40 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', |
|
47 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', | |
41 | 'Lifetime': '有効期間', |
|
48 | 'Lifetime': '有効期間', | |
42 | 'Loading ...': '読み込み中...', |
|
49 | 'Loading ...': '読み込み中...', | |
|
50 | 'Loading diff ...': 'Loading diff ...', | |||
43 | 'Loading failed': '読み込み失敗', |
|
51 | 'Loading failed': '読み込み失敗', | |
44 | 'Loading more results...': '結果を読み込み中...', |
|
52 | 'Loading more results...': '結果を読み込み中...', | |
45 | 'Loading...': 'Loading...', |
|
53 | 'Loading...': 'Loading...', | |
@@ -68,6 +76,7 b' var _TM = {' | |||||
68 | 'Please delete {0} characters': '{0} 文字削除してください', |
|
76 | 'Please delete {0} characters': '{0} 文字削除してください', | |
69 | 'Please enter {0} or more character': '{0} 文字以上入力してください', |
|
77 | 'Please enter {0} or more character': '{0} 文字以上入力してください', | |
70 | 'Please enter {0} or more characters': '{0} 文字以上入力してください', |
|
78 | 'Please enter {0} or more characters': '{0} 文字以上入力してください', | |
|
79 | 'Please wait creating pull request...': 'Please wait creating pull request...', | |||
71 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', |
|
80 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', | |
72 | 'Saving...': 'Saving...', |
|
81 | 'Saving...': 'Saving...', | |
73 | 'Searching...': '検索中...', |
|
82 | 'Searching...': '検索中...', | |
@@ -75,12 +84,14 b' var _TM = {' | |||||
75 | 'Send': '送信', |
|
84 | 'Send': '送信', | |
76 | 'Set status to Approved': 'ステータスを承認にする', |
|
85 | 'Set status to Approved': 'ステータスを承認にする', | |
77 | 'Set status to Rejected': 'ステータスを拒否にする', |
|
86 | 'Set status to Rejected': 'ステータスを拒否にする', | |
|
87 | 'Show': 'Show', | |||
78 | 'Show at Commit ': 'Show at Commit ', |
|
88 | 'Show at Commit ': 'Show at Commit ', | |
79 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', |
|
89 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', | |
80 | 'Show full context diff': 'Show full context diff', |
|
90 | 'Show full context diff': 'Show full context diff', | |
81 | 'Show more': 'もっと表示', |
|
91 | 'Show more': 'もっと表示', | |
82 | 'Show selected commit __S': 'Show selected commit __S', |
|
92 | 'Show selected commit __S': 'Show selected commit __S', | |
83 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', |
|
93 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', | |
|
94 | 'Show this authentication token?': 'Show this authentication token?', | |||
84 | 'Show whitespace changes': 'Show whitespace changes', |
|
95 | 'Show whitespace changes': 'Show whitespace changes', | |
85 | 'Specified expiration date': 'Specified expiration date', |
|
96 | 'Specified expiration date': 'Specified expiration date', | |
86 | 'Start following this repository': 'このリポジトリのフォローする', |
|
97 | 'Start following this repository': 'このリポジトリのフォローする', | |
@@ -94,6 +105,10 b' var _TM = {' | |||||
94 | 'TODO comment': 'TODO comment', |
|
105 | 'TODO comment': 'TODO comment', | |
95 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', |
|
106 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', | |
96 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', |
|
107 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', | |
|
108 | 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', | |||
|
109 | 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', | |||
|
110 | 'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.', | |||
|
111 | 'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.', | |||
97 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', |
|
112 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', | |
98 | 'Unfollow': 'アンフォロー', |
|
113 | 'Unfollow': 'アンフォロー', | |
99 | 'Unwatch': 'Unwatch', |
|
114 | 'Unwatch': 'Unwatch', | |
@@ -101,6 +116,7 b' var _TM = {' | |||||
101 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', |
|
116 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', | |
102 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', |
|
117 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', | |
103 | 'Watch': 'Watch', |
|
118 | 'Watch': 'Watch', | |
|
119 | 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', | |||
104 | 'You can only select {0} item': '{0} 件のみ選択できます', |
|
120 | 'You can only select {0} item': '{0} 件のみ選択できます', | |
105 | 'You can only select {0} items': '{0} 件のみ選択できます', |
|
121 | 'You can only select {0} items': '{0} 件のみ選択できます', | |
106 | 'activated': 'activated', |
|
122 | 'activated': 'activated', | |
@@ -117,6 +133,7 b' var _TM = {' | |||||
117 | 'just now': 'たったいま', |
|
133 | 'just now': 'たったいま', | |
118 | 'loading...': '読み込み中...', |
|
134 | 'loading...': '読み込み中...', | |
119 | 'member of "{0}"': 'member of "{0}"', |
|
135 | 'member of "{0}"': 'member of "{0}"', | |
|
136 | 'no commits': 'no commits', | |||
120 | 'not active': 'not active', |
|
137 | 'not active': 'not active', | |
121 | 'resolve comment': 'resolve comment', |
|
138 | 'resolve comment': 'resolve comment', | |
122 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
|
139 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
@@ -1,13 +1,17 b'' | |||||
1 | // AUTO GENERATED FILE FOR Babel JS-GETTEXT EXTRACTORS, DO NOT CHANGE |
|
1 | // AUTO GENERATED FILE FOR Babel JS-GETTEXT EXTRACTORS, DO NOT CHANGE | |
2 | _gettext('(from usergroup {0})'); |
|
2 | _gettext('(from usergroup {0})'); | |
|
3 | _gettext('<strong>{0} file</strong> changed, '); | |||
|
4 | _gettext('<strong>{0} files</strong> changed, '); | |||
3 | _gettext('Add another comment'); |
|
5 | _gettext('Add another comment'); | |
4 | _gettext('Adding new reviewers is forbidden.'); |
|
6 | _gettext('Adding new reviewers is forbidden.'); | |
|
7 | _gettext('Ajax Request Error'); | |||
5 | _gettext('All Authors'); |
|
8 | _gettext('All Authors'); | |
6 | _gettext('All individual reviewers must vote.'); |
|
9 | _gettext('All individual reviewers must vote.'); | |
7 | _gettext('All reviewers must vote.'); |
|
10 | _gettext('All reviewers must vote.'); | |
8 | _gettext('Are you sure to close this pull request without merging?'); |
|
11 | _gettext('Are you sure to close this pull request without merging?'); | |
9 | _gettext('At least {0} reviewer must vote.'); |
|
12 | _gettext('At least {0} reviewer must vote.'); | |
10 | _gettext('At least {0} reviewers must vote.'); |
|
13 | _gettext('At least {0} reviewers must vote.'); | |
|
14 | _gettext('Authentication Token'); | |||
11 | _gettext('Author is not allowed to be a reviewer.'); |
|
15 | _gettext('Author is not allowed to be a reviewer.'); | |
12 | _gettext('Changed files'); |
|
16 | _gettext('Changed files'); | |
13 | _gettext('Close'); |
|
17 | _gettext('Close'); | |
@@ -17,13 +21,16 b'' | |||||
17 | _gettext('Comment text will be set automatically based on currently selected status ({0}) ...'); |
|
21 | _gettext('Comment text will be set automatically based on currently selected status ({0}) ...'); | |
18 | _gettext('Commit Authors are not allowed to be a reviewer.'); |
|
22 | _gettext('Commit Authors are not allowed to be a reviewer.'); | |
19 | _gettext('Context file: '); |
|
23 | _gettext('Context file: '); | |
|
24 | _gettext('Delete'); | |||
20 | _gettext('Delete this comment?'); |
|
25 | _gettext('Delete this comment?'); | |
21 | _gettext('Diff to Commit '); |
|
26 | _gettext('Diff to Commit '); | |
|
27 | _gettext('Error during search operation'); | |||
22 | _gettext('Expand all files'); |
|
28 | _gettext('Expand all files'); | |
23 | _gettext('Expand {0} commit'); |
|
29 | _gettext('Expand {0} commit'); | |
24 | _gettext('Expand {0} commits'); |
|
30 | _gettext('Expand {0} commits'); | |
25 | _gettext('Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.'); |
|
31 | _gettext('Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.'); | |
26 | _gettext('Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.'); |
|
32 | _gettext('Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.'); | |
|
33 | _gettext('File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.'); | |||
27 | _gettext('Follow'); |
|
34 | _gettext('Follow'); | |
28 | _gettext('Force updating...'); |
|
35 | _gettext('Force updating...'); | |
29 | _gettext('Hide full context diff'); |
|
36 | _gettext('Hide full context diff'); | |
@@ -34,6 +41,7 b'' | |||||
34 | _gettext('Leave a resolution comment, or click resolve button to resolve TODO comment #{0}'); |
|
41 | _gettext('Leave a resolution comment, or click resolve button to resolve TODO comment #{0}'); | |
35 | _gettext('Lifetime'); |
|
42 | _gettext('Lifetime'); | |
36 | _gettext('Loading ...'); |
|
43 | _gettext('Loading ...'); | |
|
44 | _gettext('Loading diff ...'); | |||
37 | _gettext('Loading failed'); |
|
45 | _gettext('Loading failed'); | |
38 | _gettext('Loading more results...'); |
|
46 | _gettext('Loading more results...'); | |
39 | _gettext('Loading...'); |
|
47 | _gettext('Loading...'); | |
@@ -62,6 +70,7 b'' | |||||
62 | _gettext('Please delete {0} characters'); |
|
70 | _gettext('Please delete {0} characters'); | |
63 | _gettext('Please enter {0} or more character'); |
|
71 | _gettext('Please enter {0} or more character'); | |
64 | _gettext('Please enter {0} or more characters'); |
|
72 | _gettext('Please enter {0} or more characters'); | |
|
73 | _gettext('Please wait creating pull request...'); | |||
65 | _gettext('Reviewers picked from source code changes.'); |
|
74 | _gettext('Reviewers picked from source code changes.'); | |
66 | _gettext('Saving...'); |
|
75 | _gettext('Saving...'); | |
67 | _gettext('Searching...'); |
|
76 | _gettext('Searching...'); | |
@@ -69,12 +78,14 b'' | |||||
69 | _gettext('Send'); |
|
78 | _gettext('Send'); | |
70 | _gettext('Set status to Approved'); |
|
79 | _gettext('Set status to Approved'); | |
71 | _gettext('Set status to Rejected'); |
|
80 | _gettext('Set status to Rejected'); | |
|
81 | _gettext('Show'); | |||
72 | _gettext('Show at Commit '); |
|
82 | _gettext('Show at Commit '); | |
73 | _gettext('Show commit range {0} ... {1}'); |
|
83 | _gettext('Show commit range {0} ... {1}'); | |
74 | _gettext('Show full context diff'); |
|
84 | _gettext('Show full context diff'); | |
75 | _gettext('Show more'); |
|
85 | _gettext('Show more'); | |
76 | _gettext('Show selected commit __S'); |
|
86 | _gettext('Show selected commit __S'); | |
77 | _gettext('Show selected commits __S ... __E'); |
|
87 | _gettext('Show selected commits __S ... __E'); | |
|
88 | _gettext('Show this authentication token?'); | |||
78 | _gettext('Show whitespace changes'); |
|
89 | _gettext('Show whitespace changes'); | |
79 | _gettext('Specified expiration date'); |
|
90 | _gettext('Specified expiration date'); | |
80 | _gettext('Start following this repository'); |
|
91 | _gettext('Start following this repository'); | |
@@ -88,6 +99,10 b'' | |||||
88 | _gettext('TODO comment'); |
|
99 | _gettext('TODO comment'); | |
89 | _gettext('TODO from comment {0} was fixed.'); |
|
100 | _gettext('TODO from comment {0} was fixed.'); | |
90 | _gettext('There are currently no open pull requests requiring your participation.'); |
|
101 | _gettext('There are currently no open pull requests requiring your participation.'); | |
|
102 | _gettext('There is a later version of file tree available. Click {0} to create a file at the latest tree.'); | |||
|
103 | _gettext('There is an existing path `{0}` at this commit.'); | |||
|
104 | _gettext('This pull requests will consist of <strong>{0} commit</strong>.'); | |||
|
105 | _gettext('This pull requests will consist of <strong>{0} commits</strong>.'); | |||
91 | _gettext('Toggle Wide Mode diff'); |
|
106 | _gettext('Toggle Wide Mode diff'); | |
92 | _gettext('Unfollow'); |
|
107 | _gettext('Unfollow'); | |
93 | _gettext('Unwatch'); |
|
108 | _gettext('Unwatch'); | |
@@ -95,6 +110,7 b'' | |||||
95 | _gettext('User `{0}` already in reviewers'); |
|
110 | _gettext('User `{0}` already in reviewers'); | |
96 | _gettext('User `{0}` not allowed to be a reviewer'); |
|
111 | _gettext('User `{0}` not allowed to be a reviewer'); | |
97 | _gettext('Watch'); |
|
112 | _gettext('Watch'); | |
|
113 | _gettext('Yes, delete comment #{0}!'); | |||
98 | _gettext('You can only select {0} item'); |
|
114 | _gettext('You can only select {0} item'); | |
99 | _gettext('You can only select {0} items'); |
|
115 | _gettext('You can only select {0} items'); | |
100 | _gettext('activated'); |
|
116 | _gettext('activated'); | |
@@ -111,6 +127,7 b'' | |||||
111 | _gettext('just now'); |
|
127 | _gettext('just now'); | |
112 | _gettext('loading...'); |
|
128 | _gettext('loading...'); | |
113 | _gettext('member of "{0}"'); |
|
129 | _gettext('member of "{0}"'); | |
|
130 | _gettext('no commits'); | |||
114 | _gettext('not active'); |
|
131 | _gettext('not active'); | |
115 | _gettext('resolve comment'); |
|
132 | _gettext('resolve comment'); | |
116 | _gettext('showing {0} out of {1} commit'); |
|
133 | _gettext('showing {0} out of {1} commit'); |
@@ -6,14 +6,18 b'' | |||||
6 | //JS translations map |
|
6 | //JS translations map | |
7 | var _TM = { |
|
7 | var _TM = { | |
8 | '(from usergroup {0})': '(from usergroup {0})', |
|
8 | '(from usergroup {0})': '(from usergroup {0})', | |
|
9 | '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ', | |||
|
10 | '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ', | |||
9 | 'Add another comment': 'Dodaj kolejny komentarz', |
|
11 | 'Add another comment': 'Dodaj kolejny komentarz', | |
10 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', |
|
12 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', | |
|
13 | 'Ajax Request Error': 'Ajax Request Error', | |||
11 | 'All Authors': 'All Authors', |
|
14 | 'All Authors': 'All Authors', | |
12 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', |
|
15 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', | |
13 | 'All reviewers must vote.': 'All reviewers must vote.', |
|
16 | 'All reviewers must vote.': 'All reviewers must vote.', | |
14 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', |
|
17 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', | |
15 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', |
|
18 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', | |
16 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', |
|
19 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', | |
|
20 | 'Authentication Token': 'Authentication Token', | |||
17 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', |
|
21 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', | |
18 | 'Changed files': 'Changed files', |
|
22 | 'Changed files': 'Changed files', | |
19 | 'Close': 'Zamknij', |
|
23 | 'Close': 'Zamknij', | |
@@ -23,13 +27,16 b' var _TM = {' | |||||
23 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', |
|
27 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', | |
24 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', |
|
28 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', | |
25 | 'Context file: ': 'Context file: ', |
|
29 | 'Context file: ': 'Context file: ', | |
|
30 | 'Delete': 'Usuń', | |||
26 | 'Delete this comment?': 'Delete this comment?', |
|
31 | 'Delete this comment?': 'Delete this comment?', | |
27 | 'Diff to Commit ': 'Diff to Commit ', |
|
32 | 'Diff to Commit ': 'Diff to Commit ', | |
|
33 | 'Error during search operation': 'Error during search operation', | |||
28 | 'Expand all files': 'Expand all files', |
|
34 | 'Expand all files': 'Expand all files', | |
29 | 'Expand {0} commit': 'Expand {0} commit', |
|
35 | 'Expand {0} commit': 'Expand {0} commit', | |
30 | 'Expand {0} commits': 'Expand {0} commits', |
|
36 | 'Expand {0} commits': 'Expand {0} commits', | |
31 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', |
|
37 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', | |
32 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', |
|
38 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', | |
|
39 | 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', | |||
33 | 'Follow': 'Obserwuj', |
|
40 | 'Follow': 'Obserwuj', | |
34 | 'Force updating...': 'Force updating...', |
|
41 | 'Force updating...': 'Force updating...', | |
35 | 'Hide full context diff': 'Hide full context diff', |
|
42 | 'Hide full context diff': 'Hide full context diff', | |
@@ -40,6 +47,7 b' var _TM = {' | |||||
40 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', |
|
47 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', | |
41 | 'Lifetime': 'Czas życia', |
|
48 | 'Lifetime': 'Czas życia', | |
42 | 'Loading ...': 'Ładuję...', |
|
49 | 'Loading ...': 'Ładuję...', | |
|
50 | 'Loading diff ...': 'Loading diff ...', | |||
43 | 'Loading failed': 'Loading failed', |
|
51 | 'Loading failed': 'Loading failed', | |
44 | 'Loading more results...': 'Loading more results...', |
|
52 | 'Loading more results...': 'Loading more results...', | |
45 | 'Loading...': 'Loading...', |
|
53 | 'Loading...': 'Loading...', | |
@@ -68,6 +76,7 b' var _TM = {' | |||||
68 | 'Please delete {0} characters': 'Please delete {0} characters', |
|
76 | 'Please delete {0} characters': 'Please delete {0} characters', | |
69 | 'Please enter {0} or more character': 'Please enter {0} or more character', |
|
77 | 'Please enter {0} or more character': 'Please enter {0} or more character', | |
70 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', |
|
78 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', | |
|
79 | 'Please wait creating pull request...': 'Please wait creating pull request...', | |||
71 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', |
|
80 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', | |
72 | 'Saving...': 'Saving...', |
|
81 | 'Saving...': 'Saving...', | |
73 | 'Searching...': 'Searching...', |
|
82 | 'Searching...': 'Searching...', | |
@@ -75,12 +84,14 b' var _TM = {' | |||||
75 | 'Send': 'Wyślij', |
|
84 | 'Send': 'Wyślij', | |
76 | 'Set status to Approved': 'Set status to Approved', |
|
85 | 'Set status to Approved': 'Set status to Approved', | |
77 | 'Set status to Rejected': 'Set status to Rejected', |
|
86 | 'Set status to Rejected': 'Set status to Rejected', | |
|
87 | 'Show': 'Show', | |||
78 | 'Show at Commit ': 'Show at Commit ', |
|
88 | 'Show at Commit ': 'Show at Commit ', | |
79 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', |
|
89 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', | |
80 | 'Show full context diff': 'Show full context diff', |
|
90 | 'Show full context diff': 'Show full context diff', | |
81 | 'Show more': 'Pokaż więcej', |
|
91 | 'Show more': 'Pokaż więcej', | |
82 | 'Show selected commit __S': 'Show selected commit __S', |
|
92 | 'Show selected commit __S': 'Show selected commit __S', | |
83 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', |
|
93 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', | |
|
94 | 'Show this authentication token?': 'Show this authentication token?', | |||
84 | 'Show whitespace changes': 'Show whitespace changes', |
|
95 | 'Show whitespace changes': 'Show whitespace changes', | |
85 | 'Specified expiration date': 'Specified expiration date', |
|
96 | 'Specified expiration date': 'Specified expiration date', | |
86 | 'Start following this repository': 'Zacznij obserwację tego repozytorium', |
|
97 | 'Start following this repository': 'Zacznij obserwację tego repozytorium', | |
@@ -94,6 +105,10 b' var _TM = {' | |||||
94 | 'TODO comment': 'TODO comment', |
|
105 | 'TODO comment': 'TODO comment', | |
95 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', |
|
106 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', | |
96 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', |
|
107 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', | |
|
108 | 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', | |||
|
109 | 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', | |||
|
110 | 'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.', | |||
|
111 | 'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.', | |||
97 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', |
|
112 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', | |
98 | 'Unfollow': 'Nie obserwuj', |
|
113 | 'Unfollow': 'Nie obserwuj', | |
99 | 'Unwatch': 'Unwatch', |
|
114 | 'Unwatch': 'Unwatch', | |
@@ -101,6 +116,7 b' var _TM = {' | |||||
101 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', |
|
116 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', | |
102 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', |
|
117 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', | |
103 | 'Watch': 'Watch', |
|
118 | 'Watch': 'Watch', | |
|
119 | 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', | |||
104 | 'You can only select {0} item': 'You can only select {0} item', |
|
120 | 'You can only select {0} item': 'You can only select {0} item', | |
105 | 'You can only select {0} items': 'You can only select {0} items', |
|
121 | 'You can only select {0} items': 'You can only select {0} items', | |
106 | 'activated': 'activated', |
|
122 | 'activated': 'activated', | |
@@ -117,6 +133,7 b' var _TM = {' | |||||
117 | 'just now': 'przed chwilą', |
|
133 | 'just now': 'przed chwilą', | |
118 | 'loading...': 'wczytywanie...', |
|
134 | 'loading...': 'wczytywanie...', | |
119 | 'member of "{0}"': 'member of "{0}"', |
|
135 | 'member of "{0}"': 'member of "{0}"', | |
|
136 | 'no commits': 'no commits', | |||
120 | 'not active': 'not active', |
|
137 | 'not active': 'not active', | |
121 | 'resolve comment': 'resolve comment', |
|
138 | 'resolve comment': 'resolve comment', | |
122 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
|
139 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
@@ -6,14 +6,18 b'' | |||||
6 | //JS translations map |
|
6 | //JS translations map | |
7 | var _TM = { |
|
7 | var _TM = { | |
8 | '(from usergroup {0})': '(from usergroup {0})', |
|
8 | '(from usergroup {0})': '(from usergroup {0})', | |
|
9 | '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ', | |||
|
10 | '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ', | |||
9 | 'Add another comment': 'Adicionar outro comentário', |
|
11 | 'Add another comment': 'Adicionar outro comentário', | |
10 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', |
|
12 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', | |
|
13 | 'Ajax Request Error': 'Ajax Request Error', | |||
11 | 'All Authors': 'All Authors', |
|
14 | 'All Authors': 'All Authors', | |
12 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', |
|
15 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', | |
13 | 'All reviewers must vote.': 'All reviewers must vote.', |
|
16 | 'All reviewers must vote.': 'All reviewers must vote.', | |
14 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', |
|
17 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', | |
15 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', |
|
18 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', | |
16 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', |
|
19 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', | |
|
20 | 'Authentication Token': 'Authentication Token', | |||
17 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', |
|
21 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', | |
18 | 'Changed files': 'Changed files', |
|
22 | 'Changed files': 'Changed files', | |
19 | 'Close': 'Close', |
|
23 | 'Close': 'Close', | |
@@ -23,13 +27,16 b' var _TM = {' | |||||
23 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', |
|
27 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', | |
24 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', |
|
28 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', | |
25 | 'Context file: ': 'Context file: ', |
|
29 | 'Context file: ': 'Context file: ', | |
|
30 | 'Delete': 'Excluir', | |||
26 | 'Delete this comment?': 'Delete this comment?', |
|
31 | 'Delete this comment?': 'Delete this comment?', | |
27 | 'Diff to Commit ': 'Diff to Commit ', |
|
32 | 'Diff to Commit ': 'Diff to Commit ', | |
|
33 | 'Error during search operation': 'Error during search operation', | |||
28 | 'Expand all files': 'Expand all files', |
|
34 | 'Expand all files': 'Expand all files', | |
29 | 'Expand {0} commit': 'Expand {0} commit', |
|
35 | 'Expand {0} commit': 'Expand {0} commit', | |
30 | 'Expand {0} commits': 'Expand {0} commits', |
|
36 | 'Expand {0} commits': 'Expand {0} commits', | |
31 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', |
|
37 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', | |
32 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', |
|
38 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', | |
|
39 | 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', | |||
33 | 'Follow': 'Seguir', |
|
40 | 'Follow': 'Seguir', | |
34 | 'Force updating...': 'Force updating...', |
|
41 | 'Force updating...': 'Force updating...', | |
35 | 'Hide full context diff': 'Hide full context diff', |
|
42 | 'Hide full context diff': 'Hide full context diff', | |
@@ -40,6 +47,7 b' var _TM = {' | |||||
40 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', |
|
47 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', | |
41 | 'Lifetime': 'Tempo de Vida', |
|
48 | 'Lifetime': 'Tempo de Vida', | |
42 | 'Loading ...': 'Carregando...', |
|
49 | 'Loading ...': 'Carregando...', | |
|
50 | 'Loading diff ...': 'Loading diff ...', | |||
43 | 'Loading failed': 'Loading failed', |
|
51 | 'Loading failed': 'Loading failed', | |
44 | 'Loading more results...': 'Loading more results...', |
|
52 | 'Loading more results...': 'Loading more results...', | |
45 | 'Loading...': 'Loading...', |
|
53 | 'Loading...': 'Loading...', | |
@@ -68,6 +76,7 b' var _TM = {' | |||||
68 | 'Please delete {0} characters': 'Please delete {0} characters', |
|
76 | 'Please delete {0} characters': 'Please delete {0} characters', | |
69 | 'Please enter {0} or more character': 'Please enter {0} or more character', |
|
77 | 'Please enter {0} or more character': 'Please enter {0} or more character', | |
70 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', |
|
78 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', | |
|
79 | 'Please wait creating pull request...': 'Please wait creating pull request...', | |||
71 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', |
|
80 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', | |
72 | 'Saving...': 'Saving...', |
|
81 | 'Saving...': 'Saving...', | |
73 | 'Searching...': 'Searching...', |
|
82 | 'Searching...': 'Searching...', | |
@@ -75,12 +84,14 b' var _TM = {' | |||||
75 | 'Send': 'Enviar', |
|
84 | 'Send': 'Enviar', | |
76 | 'Set status to Approved': 'Set status to Approved', |
|
85 | 'Set status to Approved': 'Set status to Approved', | |
77 | 'Set status to Rejected': 'Set status to Rejected', |
|
86 | 'Set status to Rejected': 'Set status to Rejected', | |
|
87 | 'Show': 'Show', | |||
78 | 'Show at Commit ': 'Show at Commit ', |
|
88 | 'Show at Commit ': 'Show at Commit ', | |
79 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', |
|
89 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', | |
80 | 'Show full context diff': 'Show full context diff', |
|
90 | 'Show full context diff': 'Show full context diff', | |
81 | 'Show more': 'Mostrar mais', |
|
91 | 'Show more': 'Mostrar mais', | |
82 | 'Show selected commit __S': 'Show selected commit __S', |
|
92 | 'Show selected commit __S': 'Show selected commit __S', | |
83 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', |
|
93 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', | |
|
94 | 'Show this authentication token?': 'Show this authentication token?', | |||
84 | 'Show whitespace changes': 'Show whitespace changes', |
|
95 | 'Show whitespace changes': 'Show whitespace changes', | |
85 | 'Specified expiration date': 'Specified expiration date', |
|
96 | 'Specified expiration date': 'Specified expiration date', | |
86 | 'Start following this repository': 'Passar a seguir este repositório', |
|
97 | 'Start following this repository': 'Passar a seguir este repositório', | |
@@ -94,6 +105,10 b' var _TM = {' | |||||
94 | 'TODO comment': 'TODO comment', |
|
105 | 'TODO comment': 'TODO comment', | |
95 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', |
|
106 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', | |
96 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', |
|
107 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', | |
|
108 | 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', | |||
|
109 | 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', | |||
|
110 | 'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.', | |||
|
111 | 'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.', | |||
97 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', |
|
112 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', | |
98 | 'Unfollow': 'Parar de seguir', |
|
113 | 'Unfollow': 'Parar de seguir', | |
99 | 'Unwatch': 'Unwatch', |
|
114 | 'Unwatch': 'Unwatch', | |
@@ -101,6 +116,7 b' var _TM = {' | |||||
101 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', |
|
116 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', | |
102 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', |
|
117 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', | |
103 | 'Watch': 'Watch', |
|
118 | 'Watch': 'Watch', | |
|
119 | 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', | |||
104 | 'You can only select {0} item': 'You can only select {0} item', |
|
120 | 'You can only select {0} item': 'You can only select {0} item', | |
105 | 'You can only select {0} items': 'You can only select {0} items', |
|
121 | 'You can only select {0} items': 'You can only select {0} items', | |
106 | 'activated': 'activated', |
|
122 | 'activated': 'activated', | |
@@ -117,6 +133,7 b' var _TM = {' | |||||
117 | 'just now': 'agora há pouco', |
|
133 | 'just now': 'agora há pouco', | |
118 | 'loading...': 'loading...', |
|
134 | 'loading...': 'loading...', | |
119 | 'member of "{0}"': 'member of "{0}"', |
|
135 | 'member of "{0}"': 'member of "{0}"', | |
|
136 | 'no commits': 'no commits', | |||
120 | 'not active': 'not active', |
|
137 | 'not active': 'not active', | |
121 | 'resolve comment': 'resolve comment', |
|
138 | 'resolve comment': 'resolve comment', | |
122 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
|
139 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
@@ -6,14 +6,18 b'' | |||||
6 | //JS translations map |
|
6 | //JS translations map | |
7 | var _TM = { |
|
7 | var _TM = { | |
8 | '(from usergroup {0})': '(from usergroup {0})', |
|
8 | '(from usergroup {0})': '(from usergroup {0})', | |
|
9 | '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ', | |||
|
10 | '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ', | |||
9 | 'Add another comment': 'Добавить другой комментарий', |
|
11 | 'Add another comment': 'Добавить другой комментарий', | |
10 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', |
|
12 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', | |
|
13 | 'Ajax Request Error': 'Ajax Request Error', | |||
11 | 'All Authors': 'All Authors', |
|
14 | 'All Authors': 'All Authors', | |
12 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', |
|
15 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', | |
13 | 'All reviewers must vote.': 'All reviewers must vote.', |
|
16 | 'All reviewers must vote.': 'All reviewers must vote.', | |
14 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', |
|
17 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', | |
15 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', |
|
18 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', | |
16 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', |
|
19 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', | |
|
20 | 'Authentication Token': 'Authentication Token', | |||
17 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', |
|
21 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', | |
18 | 'Changed files': 'Changed files', |
|
22 | 'Changed files': 'Changed files', | |
19 | 'Close': 'Close', |
|
23 | 'Close': 'Close', | |
@@ -23,13 +27,16 b' var _TM = {' | |||||
23 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', |
|
27 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', | |
24 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', |
|
28 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', | |
25 | 'Context file: ': 'Context file: ', |
|
29 | 'Context file: ': 'Context file: ', | |
|
30 | 'Delete': 'Удалить', | |||
26 | 'Delete this comment?': 'Delete this comment?', |
|
31 | 'Delete this comment?': 'Delete this comment?', | |
27 | 'Diff to Commit ': 'Diff to Commit ', |
|
32 | 'Diff to Commit ': 'Diff to Commit ', | |
|
33 | 'Error during search operation': 'Error during search operation', | |||
28 | 'Expand all files': 'Expand all files', |
|
34 | 'Expand all files': 'Expand all files', | |
29 | 'Expand {0} commit': 'Expand {0} commit', |
|
35 | 'Expand {0} commit': 'Expand {0} commit', | |
30 | 'Expand {0} commits': 'Expand {0} commits', |
|
36 | 'Expand {0} commits': 'Expand {0} commits', | |
31 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', |
|
37 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', | |
32 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', |
|
38 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', | |
|
39 | 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', | |||
33 | 'Follow': 'Наблюдать', |
|
40 | 'Follow': 'Наблюдать', | |
34 | 'Force updating...': 'Force updating...', |
|
41 | 'Force updating...': 'Force updating...', | |
35 | 'Hide full context diff': 'Hide full context diff', |
|
42 | 'Hide full context diff': 'Hide full context diff', | |
@@ -40,6 +47,7 b' var _TM = {' | |||||
40 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', |
|
47 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', | |
41 | 'Lifetime': 'Срок', |
|
48 | 'Lifetime': 'Срок', | |
42 | 'Loading ...': 'Загрузка...', |
|
49 | 'Loading ...': 'Загрузка...', | |
|
50 | 'Loading diff ...': 'Loading diff ...', | |||
43 | 'Loading failed': 'Loading failed', |
|
51 | 'Loading failed': 'Loading failed', | |
44 | 'Loading more results...': 'Loading more results...', |
|
52 | 'Loading more results...': 'Loading more results...', | |
45 | 'Loading...': 'Loading...', |
|
53 | 'Loading...': 'Loading...', | |
@@ -68,6 +76,7 b' var _TM = {' | |||||
68 | 'Please delete {0} characters': 'Please delete {0} characters', |
|
76 | 'Please delete {0} characters': 'Please delete {0} characters', | |
69 | 'Please enter {0} or more character': 'Please enter {0} or more character', |
|
77 | 'Please enter {0} or more character': 'Please enter {0} or more character', | |
70 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', |
|
78 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', | |
|
79 | 'Please wait creating pull request...': 'Please wait creating pull request...', | |||
71 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', |
|
80 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', | |
72 | 'Saving...': 'Saving...', |
|
81 | 'Saving...': 'Saving...', | |
73 | 'Searching...': 'Searching...', |
|
82 | 'Searching...': 'Searching...', | |
@@ -75,12 +84,14 b' var _TM = {' | |||||
75 | 'Send': 'Отправить', |
|
84 | 'Send': 'Отправить', | |
76 | 'Set status to Approved': 'Set status to Approved', |
|
85 | 'Set status to Approved': 'Set status to Approved', | |
77 | 'Set status to Rejected': 'Set status to Rejected', |
|
86 | 'Set status to Rejected': 'Set status to Rejected', | |
|
87 | 'Show': 'Show', | |||
78 | 'Show at Commit ': 'Show at Commit ', |
|
88 | 'Show at Commit ': 'Show at Commit ', | |
79 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', |
|
89 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', | |
80 | 'Show full context diff': 'Show full context diff', |
|
90 | 'Show full context diff': 'Show full context diff', | |
81 | 'Show more': 'Показать еще', |
|
91 | 'Show more': 'Показать еще', | |
82 | 'Show selected commit __S': 'Show selected commit __S', |
|
92 | 'Show selected commit __S': 'Show selected commit __S', | |
83 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', |
|
93 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', | |
|
94 | 'Show this authentication token?': 'Show this authentication token?', | |||
84 | 'Show whitespace changes': 'Show whitespace changes', |
|
95 | 'Show whitespace changes': 'Show whitespace changes', | |
85 | 'Specified expiration date': 'Specified expiration date', |
|
96 | 'Specified expiration date': 'Specified expiration date', | |
86 | 'Start following this repository': 'Наблюдать за репозиторием', |
|
97 | 'Start following this repository': 'Наблюдать за репозиторием', | |
@@ -94,6 +105,10 b' var _TM = {' | |||||
94 | 'TODO comment': 'TODO comment', |
|
105 | 'TODO comment': 'TODO comment', | |
95 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', |
|
106 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', | |
96 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', |
|
107 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', | |
|
108 | 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', | |||
|
109 | 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', | |||
|
110 | 'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.', | |||
|
111 | 'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.', | |||
97 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', |
|
112 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', | |
98 | 'Unfollow': 'Не наблюдать', |
|
113 | 'Unfollow': 'Не наблюдать', | |
99 | 'Unwatch': 'Unwatch', |
|
114 | 'Unwatch': 'Unwatch', | |
@@ -101,6 +116,7 b' var _TM = {' | |||||
101 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', |
|
116 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', | |
102 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', |
|
117 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', | |
103 | 'Watch': 'Watch', |
|
118 | 'Watch': 'Watch', | |
|
119 | 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', | |||
104 | 'You can only select {0} item': 'You can only select {0} item', |
|
120 | 'You can only select {0} item': 'You can only select {0} item', | |
105 | 'You can only select {0} items': 'You can only select {0} items', |
|
121 | 'You can only select {0} items': 'You can only select {0} items', | |
106 | 'activated': 'activated', |
|
122 | 'activated': 'activated', | |
@@ -117,6 +133,7 b' var _TM = {' | |||||
117 | 'just now': 'прямо сейчас', |
|
133 | 'just now': 'прямо сейчас', | |
118 | 'loading...': 'загрузка...', |
|
134 | 'loading...': 'загрузка...', | |
119 | 'member of "{0}"': 'member of "{0}"', |
|
135 | 'member of "{0}"': 'member of "{0}"', | |
|
136 | 'no commits': 'no commits', | |||
120 | 'not active': 'not active', |
|
137 | 'not active': 'not active', | |
121 | 'resolve comment': 'resolve comment', |
|
138 | 'resolve comment': 'resolve comment', | |
122 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
|
139 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
@@ -6,14 +6,18 b'' | |||||
6 | //JS translations map |
|
6 | //JS translations map | |
7 | var _TM = { |
|
7 | var _TM = { | |
8 | '(from usergroup {0})': '(from usergroup {0})', |
|
8 | '(from usergroup {0})': '(from usergroup {0})', | |
|
9 | '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ', | |||
|
10 | '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> changed, ', | |||
9 | 'Add another comment': 'Add another comment', |
|
11 | 'Add another comment': 'Add another comment', | |
10 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', |
|
12 | 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', | |
|
13 | 'Ajax Request Error': 'Ajax Request Error', | |||
11 | 'All Authors': 'All Authors', |
|
14 | 'All Authors': 'All Authors', | |
12 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', |
|
15 | 'All individual reviewers must vote.': 'All individual reviewers must vote.', | |
13 | 'All reviewers must vote.': 'All reviewers must vote.', |
|
16 | 'All reviewers must vote.': 'All reviewers must vote.', | |
14 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', |
|
17 | 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', | |
15 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', |
|
18 | 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', | |
16 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', |
|
19 | 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', | |
|
20 | 'Authentication Token': 'Authentication Token', | |||
17 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', |
|
21 | 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', | |
18 | 'Changed files': 'Changed files', |
|
22 | 'Changed files': 'Changed files', | |
19 | 'Close': 'Close', |
|
23 | 'Close': 'Close', | |
@@ -23,13 +27,16 b' var _TM = {' | |||||
23 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', |
|
27 | 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', | |
24 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', |
|
28 | 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', | |
25 | 'Context file: ': 'Context file: ', |
|
29 | 'Context file: ': 'Context file: ', | |
|
30 | 'Delete': '删除', | |||
26 | 'Delete this comment?': 'Delete this comment?', |
|
31 | 'Delete this comment?': 'Delete this comment?', | |
27 | 'Diff to Commit ': 'Diff to Commit ', |
|
32 | 'Diff to Commit ': 'Diff to Commit ', | |
|
33 | 'Error during search operation': 'Error during search operation', | |||
28 | 'Expand all files': 'Expand all files', |
|
34 | 'Expand all files': 'Expand all files', | |
29 | 'Expand {0} commit': 'Expand {0} commit', |
|
35 | 'Expand {0} commit': 'Expand {0} commit', | |
30 | 'Expand {0} commits': 'Expand {0} commits', |
|
36 | 'Expand {0} commits': 'Expand {0} commits', | |
31 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', |
|
37 | 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.', | |
32 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', |
|
38 | 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', | |
|
39 | 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', | |||
33 | 'Follow': 'Follow', |
|
40 | 'Follow': 'Follow', | |
34 | 'Force updating...': 'Force updating...', |
|
41 | 'Force updating...': 'Force updating...', | |
35 | 'Hide full context diff': 'Hide full context diff', |
|
42 | 'Hide full context diff': 'Hide full context diff', | |
@@ -40,6 +47,7 b' var _TM = {' | |||||
40 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', |
|
47 | 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', | |
41 | 'Lifetime': '终身', |
|
48 | 'Lifetime': '终身', | |
42 | 'Loading ...': 'Loading ...', |
|
49 | 'Loading ...': 'Loading ...', | |
|
50 | 'Loading diff ...': 'Loading diff ...', | |||
43 | 'Loading failed': 'Loading failed', |
|
51 | 'Loading failed': 'Loading failed', | |
44 | 'Loading more results...': 'Loading more results...', |
|
52 | 'Loading more results...': 'Loading more results...', | |
45 | 'Loading...': 'Loading...', |
|
53 | 'Loading...': 'Loading...', | |
@@ -68,6 +76,7 b' var _TM = {' | |||||
68 | 'Please delete {0} characters': 'Please delete {0} characters', |
|
76 | 'Please delete {0} characters': 'Please delete {0} characters', | |
69 | 'Please enter {0} or more character': 'Please enter {0} or more character', |
|
77 | 'Please enter {0} or more character': 'Please enter {0} or more character', | |
70 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', |
|
78 | 'Please enter {0} or more characters': 'Please enter {0} or more characters', | |
|
79 | 'Please wait creating pull request...': 'Please wait creating pull request...', | |||
71 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', |
|
80 | 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', | |
72 | 'Saving...': 'Saving...', |
|
81 | 'Saving...': 'Saving...', | |
73 | 'Searching...': 'Searching...', |
|
82 | 'Searching...': 'Searching...', | |
@@ -75,12 +84,14 b' var _TM = {' | |||||
75 | 'Send': '发送', |
|
84 | 'Send': '发送', | |
76 | 'Set status to Approved': 'Set status to Approved', |
|
85 | 'Set status to Approved': 'Set status to Approved', | |
77 | 'Set status to Rejected': 'Set status to Rejected', |
|
86 | 'Set status to Rejected': 'Set status to Rejected', | |
|
87 | 'Show': 'Show', | |||
78 | 'Show at Commit ': 'Show at Commit ', |
|
88 | 'Show at Commit ': 'Show at Commit ', | |
79 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', |
|
89 | 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', | |
80 | 'Show full context diff': 'Show full context diff', |
|
90 | 'Show full context diff': 'Show full context diff', | |
81 | 'Show more': 'Show more', |
|
91 | 'Show more': 'Show more', | |
82 | 'Show selected commit __S': 'Show selected commit __S', |
|
92 | 'Show selected commit __S': 'Show selected commit __S', | |
83 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', |
|
93 | 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', | |
|
94 | 'Show this authentication token?': 'Show this authentication token?', | |||
84 | 'Show whitespace changes': 'Show whitespace changes', |
|
95 | 'Show whitespace changes': 'Show whitespace changes', | |
85 | 'Specified expiration date': 'Specified expiration date', |
|
96 | 'Specified expiration date': 'Specified expiration date', | |
86 | 'Start following this repository': '开始关注该版本库', |
|
97 | 'Start following this repository': '开始关注该版本库', | |
@@ -94,6 +105,10 b' var _TM = {' | |||||
94 | 'TODO comment': 'TODO comment', |
|
105 | 'TODO comment': 'TODO comment', | |
95 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', |
|
106 | 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', | |
96 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', |
|
107 | 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', | |
|
108 | 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', | |||
|
109 | 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', | |||
|
110 | 'This pull requests will consist of <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.', | |||
|
111 | 'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.', | |||
97 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', |
|
112 | 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', | |
98 | 'Unfollow': 'Unfollow', |
|
113 | 'Unfollow': 'Unfollow', | |
99 | 'Unwatch': 'Unwatch', |
|
114 | 'Unwatch': 'Unwatch', | |
@@ -101,6 +116,7 b' var _TM = {' | |||||
101 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', |
|
116 | 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', | |
102 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', |
|
117 | 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', | |
103 | 'Watch': 'Watch', |
|
118 | 'Watch': 'Watch', | |
|
119 | 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', | |||
104 | 'You can only select {0} item': 'You can only select {0} item', |
|
120 | 'You can only select {0} item': 'You can only select {0} item', | |
105 | 'You can only select {0} items': 'You can only select {0} items', |
|
121 | 'You can only select {0} items': 'You can only select {0} items', | |
106 | 'activated': 'activated', |
|
122 | 'activated': 'activated', | |
@@ -117,6 +133,7 b' var _TM = {' | |||||
117 | 'just now': '刚刚', |
|
133 | 'just now': '刚刚', | |
118 | 'loading...': 'loading...', |
|
134 | 'loading...': 'loading...', | |
119 | 'member of "{0}"': 'member of "{0}"', |
|
135 | 'member of "{0}"': 'member of "{0}"', | |
|
136 | 'no commits': 'no commits', | |||
120 | 'not active': 'not active', |
|
137 | 'not active': 'not active', | |
121 | 'resolve comment': 'resolve comment', |
|
138 | 'resolve comment': 'resolve comment', | |
122 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
|
139 | 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', |
@@ -50,18 +50,27 b'' | |||||
50 | <div id="footer"> |
|
50 | <div id="footer"> | |
51 | <div id="footer-inner" class="title wrapper"> |
|
51 | <div id="footer-inner" class="title wrapper"> | |
52 | <div> |
|
52 | <div> | |
|
53 | <% sid = 'block' if request.GET.get('showrcid') else 'none' %> | |||
|
54 | ||||
53 | <p class="footer-link-right"> |
|
55 | <p class="footer-link-right"> | |
|
56 | <a class="grey-link-action" href="${h.route_path('home', _query={'showrcid': 1})}"> | |||
|
57 | RhodeCode | |||
54 | % if c.visual.show_version: |
|
58 | % if c.visual.show_version: | |
55 |
|
|
59 | ${c.rhodecode_version} | |
56 | % endif |
|
60 | % endif | |
57 | © 2010-${h.datetime.today().year}, <a href="${h.route_url('rhodecode_official')}" target="_blank">RhodeCode GmbH</a>. All rights reserved. |
|
61 | ${c.rhodecode_edition} | |
|
62 | </a> | | |||
|
63 | ||||
58 |
|
|
64 | % if c.visual.rhodecode_support_url: | |
59 | <a href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support')}</a> |
|
65 | <a class="grey-link-action" href="${c.visual.rhodecode_support_url}" target="_blank">${_('Support')}</a> | | |
|
66 | <a class="grey-link-action" href="https://docs.rhodecode.com" target="_blank">${_('Documentation')}</a> | |||
60 | % endif |
|
67 | % endif | |
|
68 | ||||
61 | </p> |
|
69 | </p> | |
62 | <% sid = 'block' if request.GET.get('showrcid') else 'none' %> |
|
70 | ||
63 | <p class="server-instance" style="display:${sid}"> |
|
71 | <p class="server-instance" style="display:${sid}"> | |
64 | ## display hidden instance ID if specially defined |
|
72 | ## display hidden instance ID if specially defined | |
|
73 | © 2010-${h.datetime.today().year}, <a href="${h.route_url('rhodecode_official')}" target="_blank">RhodeCode GmbH</a>. All rights reserved. | |||
65 | % if c.rhodecode_instanceid: |
|
74 | % if c.rhodecode_instanceid: | |
66 | ${_('RhodeCode instance id: {}').format(c.rhodecode_instanceid)} |
|
75 | ${_('RhodeCode instance id: {}').format(c.rhodecode_instanceid)} | |
67 | % endif |
|
76 | % endif | |
@@ -363,9 +372,9 b'' | |||||
363 | </div> |
|
372 | </div> | |
364 |
|
373 | |||
365 | <ul id="context-pages" class="navigation horizontal-list"> |
|
374 | <ul id="context-pages" class="navigation horizontal-list"> | |
366 | <li class="${h.is_active('summary', active)}"><a class="menulink" href="${h.route_path('repo_summary', repo_name=c.repo_name)}"><div class="menulabel">${_('Summary')}</div></a></li> |
|
375 | <li class="${h.is_active('summary', active)}"><a class="menulink" href="${h.route_path('repo_summary_explicit', repo_name=c.repo_name)}"><div class="menulabel">${_('Summary')}</div></a></li> | |
367 | <li class="${h.is_active('commits', active)}"><a class="menulink" href="${h.route_path('repo_commits', repo_name=c.repo_name)}"><div class="menulabel">${_('Commits')}</div></a></li> |
|
376 | <li class="${h.is_active('commits', active)}"><a class="menulink" href="${h.route_path('repo_commits', repo_name=c.repo_name)}"><div class="menulabel">${_('Commits')}</div></a></li> | |
368 |
<li class="${h.is_active('files', active)}"><a class="menulink" href="${h.r |
|
377 | <li class="${h.is_active('files', active)}"><a class="menulink" href="${h.repo_files_by_ref_url(c.repo_name, c.rhodecode_db_repo.repo_type, f_path='', ref_name=c.rhodecode_db_repo.landing_ref_name, commit_id='tip', query={'at':c.rhodecode_db_repo.landing_ref_name})}"><div class="menulabel">${_('Files')}</div></a></li> | |
369 | <li class="${h.is_active('compare', active)}"><a class="menulink" href="${h.route_path('repo_compare_select',repo_name=c.repo_name)}"><div class="menulabel">${_('Compare')}</div></a></li> |
|
378 | <li class="${h.is_active('compare', active)}"><a class="menulink" href="${h.route_path('repo_compare_select',repo_name=c.repo_name)}"><div class="menulabel">${_('Compare')}</div></a></li> | |
370 |
|
379 | |||
371 | ## TODO: anderson: ideally it would have a function on the scm_instance "enable_pullrequest() and enable_fork()" |
|
380 | ## TODO: anderson: ideally it would have a function on the scm_instance "enable_pullrequest() and enable_fork()" |
@@ -6,7 +6,7 b" c.template_context['repo_name'] = getatt" | |||||
6 | go_import_header = '' |
|
6 | go_import_header = '' | |
7 | if hasattr(c, 'rhodecode_db_repo'): |
|
7 | if hasattr(c, 'rhodecode_db_repo'): | |
8 | c.template_context['repo_type'] = c.rhodecode_db_repo.repo_type |
|
8 | c.template_context['repo_type'] = c.rhodecode_db_repo.repo_type | |
9 |
c.template_context['repo_landing_commit'] = c.rhodecode_db_repo.landing_re |
|
9 | c.template_context['repo_landing_commit'] = c.rhodecode_db_repo.landing_ref_name | |
10 | c.template_context['repo_id'] = c.rhodecode_db_repo.repo_id |
|
10 | c.template_context['repo_id'] = c.rhodecode_db_repo.repo_id | |
11 | c.template_context['repo_view_type'] = h.get_repo_view_type(request) |
|
11 | c.template_context['repo_view_type'] = h.get_repo_view_type(request) | |
12 |
|
12 |
@@ -253,8 +253,16 b" return '%s_%s_%i' % (h.md5_safe(commit+f" | |||||
253 | data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}" |
|
253 | data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}" | |
254 | > |
|
254 | > | |
255 | <label for="filediff-collapse-${id(filediff)}" class="filediff-heading"> |
|
255 | <label for="filediff-collapse-${id(filediff)}" class="filediff-heading"> | |
|
256 | <% | |||
|
257 | file_comments = (get_inline_comments(inline_comments, filediff.patch['filename']) or {}).values() | |||
|
258 | total_file_comments = [_c for _c in h.itertools.chain.from_iterable(file_comments) if not _c.outdated] | |||
|
259 | %> | |||
256 | <div class="filediff-collapse-indicator icon-"></div> |
|
260 | <div class="filediff-collapse-indicator icon-"></div> | |
|
261 | <span class="pill-group pull-right" > | |||
|
262 | <span class="pill"><i class="icon-comment"></i> ${len(total_file_comments)}</span> | |||
|
263 | </span> | |||
257 | ${diff_ops(filediff)} |
|
264 | ${diff_ops(filediff)} | |
|
265 | ||||
258 | </label> |
|
266 | </label> | |
259 |
|
267 | |||
260 | ${diff_menu(filediff, use_comments=use_comments)} |
|
268 | ${diff_menu(filediff, use_comments=use_comments)} | |
@@ -484,7 +492,7 b' from rhodecode.lib.diffs import NEW_FILE' | |||||
484 | <% final_path = filediff.target_file_path %> |
|
492 | <% final_path = filediff.target_file_path %> | |
485 | %endif |
|
493 | %endif | |
486 | %endif |
|
494 | %endif | |
487 |
<i style="color: #aaa" class=" |
|
495 | <i style="color: #aaa" class="on-hover-icon icon-clipboard clipboard-action" data-clipboard-text="${final_path}" title="${_('Copy file path')}" onclick="return false;"></i> | |
488 | </span> |
|
496 | </span> | |
489 | ## anchor link |
|
497 | ## anchor link | |
490 | <a class="pill filediff-anchor" href="#a_${h.FID(filediff.raw_id, filediff.patch['filename'])}">¶</a> |
|
498 | <a class="pill filediff-anchor" href="#a_${h.FID(filediff.raw_id, filediff.patch['filename'])}">¶</a> | |
@@ -615,6 +623,19 b' from rhodecode.lib.diffs import NEW_FILE' | |||||
615 | </%def> |
|
623 | </%def> | |
616 |
|
624 | |||
617 | <%! |
|
625 | <%! | |
|
626 | ||||
|
627 | def get_inline_comments(comments, filename): | |||
|
628 | if hasattr(filename, 'unicode_path'): | |||
|
629 | filename = filename.unicode_path | |||
|
630 | ||||
|
631 | if not isinstance(filename, (unicode, str)): | |||
|
632 | return None | |||
|
633 | ||||
|
634 | if comments and filename in comments: | |||
|
635 | return comments[filename] | |||
|
636 | ||||
|
637 | return None | |||
|
638 | ||||
618 | def get_comments_for(diff_type, comments, filename, line_version, line_number): |
|
639 | def get_comments_for(diff_type, comments, filename, line_version, line_number): | |
619 | if hasattr(filename, 'unicode_path'): |
|
640 | if hasattr(filename, 'unicode_path'): | |
620 | filename = filename.unicode_path |
|
641 | filename = filename.unicode_path | |
@@ -622,10 +643,11 b' def get_comments_for(diff_type, comments' | |||||
622 | if not isinstance(filename, (unicode, str)): |
|
643 | if not isinstance(filename, (unicode, str)): | |
623 | return None |
|
644 | return None | |
624 |
|
645 | |||
625 | line_key = '{}{}'.format(line_version, line_number) ## e.g o37, n12 |
|
646 | file_comments = get_inline_comments(comments, filename) | |
|
647 | if file_comments is None: | |||
|
648 | return None | |||
626 |
|
649 | |||
627 | if comments and filename in comments: |
|
650 | line_key = '{}{}'.format(line_version, line_number) ## e.g o37, n12 | |
628 | file_comments = comments[filename] |
|
|||
629 |
|
|
651 | if line_key in file_comments: | |
630 |
|
|
652 | data = file_comments.pop(line_key) | |
631 |
|
|
653 | return data | |
@@ -655,9 +677,9 b' def get_comments_for(diff_type, comments' | |||||
655 | %if line_old_comments: |
|
677 | %if line_old_comments: | |
656 | <% has_outdated = any([x.outdated for x in line_old_comments]) %> |
|
678 | <% has_outdated = any([x.outdated for x in line_old_comments]) %> | |
657 | % if has_outdated: |
|
679 | % if has_outdated: | |
658 | <i title="${_('comments including outdated')}:${len(line_old_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
680 | <i class="tooltip" title="${_('comments including outdated, click to show them')}:${len(line_old_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> | |
659 | % else: |
|
681 | % else: | |
660 | <i title="${_('comments')}: ${len(line_old_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
682 | <i class="tooltip" title="${_('comments')}: ${len(line_old_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> | |
661 | % endif |
|
683 | % endif | |
662 | %endif |
|
684 | %endif | |
663 | </div> |
|
685 | </div> | |
@@ -698,9 +720,9 b' def get_comments_for(diff_type, comments' | |||||
698 | %if line_new_comments: |
|
720 | %if line_new_comments: | |
699 | <% has_outdated = any([x.outdated for x in line_new_comments]) %> |
|
721 | <% has_outdated = any([x.outdated for x in line_new_comments]) %> | |
700 | % if has_outdated: |
|
722 | % if has_outdated: | |
701 | <i title="${_('comments including outdated')}:${len(line_new_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
723 | <i class="tooltip" title="${_('comments including outdated, click to show them')}:${len(line_new_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> | |
702 | % else: |
|
724 | % else: | |
703 | <i title="${_('comments')}: ${len(line_new_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
725 | <i class="tooltip" title="${_('comments')}: ${len(line_new_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> | |
704 | % endif |
|
726 | % endif | |
705 | %endif |
|
727 | %endif | |
706 | </div> |
|
728 | </div> | |
@@ -754,9 +776,9 b' def get_comments_for(diff_type, comments' | |||||
754 | % if comments: |
|
776 | % if comments: | |
755 | <% has_outdated = any([x.outdated for x in comments]) %> |
|
777 | <% has_outdated = any([x.outdated for x in comments]) %> | |
756 | % if has_outdated: |
|
778 | % if has_outdated: | |
757 | <i title="${_('comments including outdated')}:${len(comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
779 | <i class="tooltip" title="${_('comments including outdated, click to show them')}:${len(comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> | |
758 | % else: |
|
780 | % else: | |
759 | <i title="${_('comments')}: ${len(comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
781 | <i class="tooltip" title="${_('comments')}: ${len(comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> | |
760 | % endif |
|
782 | % endif | |
761 | % endif |
|
783 | % endif | |
762 | </div> |
|
784 | </div> |
@@ -60,10 +60,10 b'' | |||||
60 | class="btn btn-small" |
|
60 | class="btn btn-small" | |
61 | href="${h.route_path('repo_compare', |
|
61 | href="${h.route_path('repo_compare', | |
62 | repo_name=c.rhodecode_db_repo.fork.repo_name, |
|
62 | repo_name=c.rhodecode_db_repo.fork.repo_name, | |
63 |
source_ref_type=c.rhodecode_db_repo.landing_re |
|
63 | source_ref_type=c.rhodecode_db_repo.landing_ref_type, | |
64 |
source_ref=c.rhodecode_db_repo.landing_re |
|
64 | source_ref=c.rhodecode_db_repo.landing_ref_name, | |
65 |
target_ref_type='branch' if request.GET.get('branch') else c.rhodecode_db_repo.landing_re |
|
65 | target_ref_type='branch' if request.GET.get('branch') else c.rhodecode_db_repo.landing_ref_type, | |
66 |
target_ref=request.GET.get('branch') or c.rhodecode_db_repo.landing_re |
|
66 | target_ref=request.GET.get('branch') or c.rhodecode_db_repo.landing_ref_name, | |
67 | _query=dict(merge=1, target_repo=c.repo_name))}" |
|
67 | _query=dict(merge=1, target_repo=c.repo_name))}" | |
68 | > |
|
68 | > | |
69 | ${_('Compare fork with Parent (%s)' % c.rhodecode_db_repo.fork.repo_name)} |
|
69 | ${_('Compare fork with Parent (%s)' % c.rhodecode_db_repo.fork.repo_name)} |
@@ -93,10 +93,10 b'' | |||||
93 | <a class="btn btn-default" title="${h.tooltip(_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name))}" |
|
93 | <a class="btn btn-default" title="${h.tooltip(_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name))}" | |
94 | href="${h.route_path('repo_compare', |
|
94 | href="${h.route_path('repo_compare', | |
95 | repo_name=c.rhodecode_db_repo.fork.repo_name, |
|
95 | repo_name=c.rhodecode_db_repo.fork.repo_name, | |
96 |
source_ref_type=c.rhodecode_db_repo.landing_re |
|
96 | source_ref_type=c.rhodecode_db_repo.landing_ref_type, | |
97 |
source_ref=c.rhodecode_db_repo.landing_re |
|
97 | source_ref=c.rhodecode_db_repo.landing_ref_name, | |
98 |
target_repo=c.repo_name,target_ref_type='branch' if request.GET.get('branch') else c.rhodecode_db_repo.landing_re |
|
98 | target_repo=c.repo_name,target_ref_type='branch' if request.GET.get('branch') else c.rhodecode_db_repo.landing_ref_type, | |
99 |
target_ref=request.GET.get('branch') or c.rhodecode_db_repo.landing_re |
|
99 | target_ref=request.GET.get('branch') or c.rhodecode_db_repo.landing_ref_name, | |
100 | _query=dict(merge=1))}" |
|
100 | _query=dict(merge=1))}" | |
101 | > |
|
101 | > | |
102 | ${_('Compare with origin')} |
|
102 | ${_('Compare with origin')} |
@@ -101,6 +101,7 b' text_monospace = "\'Menlo\', \'Liberation M' | |||||
101 | margin: 0; |
|
101 | margin: 0; | |
102 | padding: 0; |
|
102 | padding: 0; | |
103 | font-family: ${text_regular|n}; |
|
103 | font-family: ${text_regular|n}; | |
|
104 | color: #000000; | |||
104 | } |
|
105 | } | |
105 |
|
106 | |||
106 | /* Prevent Webkit and Windows Mobile platforms from changing default font sizes.*/ |
|
107 | /* Prevent Webkit and Windows Mobile platforms from changing default font sizes.*/ | |
@@ -211,6 +212,20 b' text_monospace = "\'Menlo\', \'Liberation M' | |||||
211 |
|
212 | |||
212 | code { |
|
213 | code { | |
213 | font-family: ${text_monospace|n}; |
|
214 | font-family: ${text_monospace|n}; | |
|
215 | white-space: pre-line !important; | |||
|
216 | color: #000000; | |||
|
217 | } | |||
|
218 | ||||
|
219 | ul.changes-ul { | |||
|
220 | list-style: none; | |||
|
221 | list-style-type: none; | |||
|
222 | padding: 0; | |||
|
223 | margin: 10px 0; | |||
|
224 | } | |||
|
225 | ul.changes-ul li { | |||
|
226 | list-style: none; | |||
|
227 | list-style-type: none; | |||
|
228 | margin: 2px 0; | |||
214 | } |
|
229 | } | |
215 |
|
230 | |||
216 | @media only screen and (-webkit-min-device-pixel-ratio: 2) { |
|
231 | @media only screen and (-webkit-min-device-pixel-ratio: 2) { | |
@@ -237,13 +252,19 b' text_monospace = "\'Menlo\', \'Liberation M' | |||||
237 | padding: 3px 5px 3px |
|
252 | padding: 3px 5px 3px | |
238 | } |
|
253 | } | |
239 |
|
254 | |||
240 | div.markdown-block h1, div.markdown-block h2, div.markdown-block h3, div.markdown-block h4, div.markdown-block h5, div.markdown-block h6 { |
|
255 | div.markdown-block h1, | |
|
256 | div.markdown-block h2, | |||
|
257 | div.markdown-block h3, | |||
|
258 | div.markdown-block h4, | |||
|
259 | div.markdown-block h5, | |||
|
260 | div.markdown-block h6 { | |||
241 | border-bottom: none !important; |
|
261 | border-bottom: none !important; | |
242 | padding: 0 !important; |
|
262 | padding: 0 !important; | |
243 | overflow: visible !important |
|
263 | overflow: visible !important | |
244 | } |
|
264 | } | |
245 |
|
265 | |||
246 |
div.markdown-block h1, |
|
266 | div.markdown-block h1, | |
|
267 | div.markdown-block h2 { | |||
247 | border-bottom: 1px #e6e5e5 solid !important |
|
268 | border-bottom: 1px #e6e5e5 solid !important | |
248 | } |
|
269 | } | |
249 |
|
270 | |||
@@ -290,7 +311,13 b' text_monospace = "\'Menlo\', \'Liberation M' | |||||
290 | margin-bottom: 13px |
|
311 | margin-bottom: 13px | |
291 | } |
|
312 | } | |
292 |
|
313 | |||
293 | div.markdown-block ol, div.markdown-block ul, div.markdown-block p, div.markdown-block blockquote, div.markdown-block dl, div.markdown-block li, div.markdown-block table { |
|
314 | div.markdown-block ol, | |
|
315 | div.markdown-block ul, | |||
|
316 | div.markdown-block p, | |||
|
317 | div.markdown-block blockquote, | |||
|
318 | div.markdown-block dl, | |||
|
319 | div.markdown-block li, | |||
|
320 | div.markdown-block table { | |||
294 | margin: 3px 0 13px 0 !important; |
|
321 | margin: 3px 0 13px 0 !important; | |
295 | color: #424242 !important; |
|
322 | color: #424242 !important; | |
296 | font-size: 13px !important; |
|
323 | font-size: 13px !important; | |
@@ -371,27 +398,30 b' text_monospace = "\'Menlo\', \'Liberation M' | |||||
371 | background-color: #eeeeee |
|
398 | background-color: #eeeeee | |
372 | } |
|
399 | } | |
373 |
|
400 | |||
374 | div.markdown-block code, div.markdown-block pre, div.markdown-block #ws, div.markdown-block #message { |
|
401 | div.markdown-block code, | |
|
402 | div.markdown-block pre, | |||
|
403 | div.markdown-block #ws, | |||
|
404 | div.markdown-block #message { | |||
375 | font-family: ${text_monospace|n}; |
|
405 | font-family: ${text_monospace|n}; | |
376 | font-size: 11px; |
|
406 | font-size: 11px; | |
377 | -webkit-border-radius: 2px; |
|
407 | -webkit-border-radius: 2px; | |
378 | -moz-border-radius: 2px; |
|
408 | -moz-border-radius: 2px; | |
379 | border-radius: 2px; |
|
409 | border-radius: 2px; | |
380 |
background-color: |
|
410 | background-color: #FFFFFF; | |
381 | color: #7E7F7F |
|
411 | color: #7E7F7F | |
382 | } |
|
412 | } | |
383 |
|
413 | |||
384 | div.markdown-block code { |
|
414 | div.markdown-block code { | |
385 |
border: 1px solid # |
|
415 | border: 1px solid #7E7F7F; | |
386 | margin: 0 2px; |
|
416 | margin: 0 2px; | |
387 | padding: 0 5px |
|
417 | padding: 0 5px | |
388 | } |
|
418 | } | |
389 |
|
419 | |||
390 | div.markdown-block pre { |
|
420 | div.markdown-block pre { | |
391 |
border: 1px solid # |
|
421 | border: 1px solid #7E7F7F; | |
392 | overflow: auto; |
|
422 | overflow: auto; | |
393 | padding: .5em; |
|
423 | padding: .5em; | |
394 |
background-color: #F |
|
424 | background-color: #FFFFFF; | |
395 | } |
|
425 | } | |
396 |
|
426 | |||
397 | div.markdown-block pre > code { |
|
427 | div.markdown-block pre > code { | |
@@ -411,7 +441,12 b' text_monospace = "\'Menlo\', \'Liberation M' | |||||
411 | font-weight: normal |
|
441 | font-weight: normal | |
412 | } |
|
442 | } | |
413 |
|
443 | |||
414 | div.rst-block h1, div.rst-block h2, div.rst-block h3, div.rst-block h4, div.rst-block h5, div.rst-block h6 { |
|
444 | div.rst-block h1, | |
|
445 | div.rst-block h2, | |||
|
446 | div.rst-block h3, | |||
|
447 | div.rst-block h4, | |||
|
448 | div.rst-block h5, | |||
|
449 | div.rst-block h6 { | |||
415 | border-bottom: 0 !important; |
|
450 | border-bottom: 0 !important; | |
416 | margin: 0 !important; |
|
451 | margin: 0 !important; | |
417 | padding: 0 !important; |
|
452 | padding: 0 !important; | |
@@ -461,7 +496,7 b' text_monospace = "\'Menlo\', \'Liberation M' | |||||
461 | background-color: ghostWhite !important; |
|
496 | background-color: ghostWhite !important; | |
462 | color: #444 !important; |
|
497 | color: #444 !important; | |
463 | padding: 0 .2em !important; |
|
498 | padding: 0 .2em !important; | |
464 |
border: 1px solid # |
|
499 | border: 1px solid #7E7F7F !important | |
465 | } |
|
500 | } | |
466 |
|
501 | |||
467 | div.rst-block pre code { |
|
502 | div.rst-block pre code { | |
@@ -474,14 +509,18 b' text_monospace = "\'Menlo\', \'Liberation M' | |||||
474 | div.rst-block pre { |
|
509 | div.rst-block pre { | |
475 | margin: 1em 0; |
|
510 | margin: 1em 0; | |
476 | padding: 15px; |
|
511 | padding: 15px; | |
477 |
border: 1px solid # |
|
512 | border: 1px solid #7E7F7F; | |
478 | -webkit-border-radius: 2px; |
|
513 | -webkit-border-radius: 2px; | |
479 | -moz-border-radius: 2px; |
|
514 | -moz-border-radius: 2px; | |
480 | border-radius: 2px; |
|
515 | border-radius: 2px; | |
481 | overflow: auto; |
|
516 | overflow: auto; | |
482 | font-size: 12px; |
|
517 | font-size: 12px; | |
483 | color: #444; |
|
518 | color: #444; | |
484 |
background-color: #F |
|
519 | background-color: #FFFFFF; | |
|
520 | } | |||
|
521 | ||||
|
522 | .clear-both { | |||
|
523 | clear:both; | |||
485 | } |
|
524 | } | |
486 |
|
525 | |||
487 | /*elasticmatch is custom rhodecode tag*/ |
|
526 | /*elasticmatch is custom rhodecode tag*/ | |
@@ -581,7 +620,7 b' text_monospace = "\'Menlo\', \'Liberation M' | |||||
581 | </a> |
|
620 | </a> | |
582 | </td> |
|
621 | </td> | |
583 | </tr> |
|
622 | </tr> | |
584 | <tr> |
|
623 | <tr style="background-color: #fff"> | |
585 | <td style="padding:15px;" valign="top">${self.body()}</td> |
|
624 | <td style="padding:15px;" valign="top">${self.body()}</td> | |
586 | </tr> |
|
625 | </tr> | |
587 | </table> |
|
626 | </table> |
@@ -89,12 +89,13 b' data = {' | |||||
89 | } |
|
89 | } | |
90 | %> |
|
90 | %> | |
91 |
|
91 | |||
|
92 | ## header | |||
92 | <table style="text-align:left;vertical-align:middle;width: 100%"> |
|
93 | <table style="text-align:left;vertical-align:middle;width: 100%"> | |
93 | <tr> |
|
94 | <tr> | |
94 | <td style="width:100%;border-bottom:1px solid #dbd9da;"> |
|
95 | <td style="width:100%;border-bottom:1px solid #dbd9da;"> | |
95 |
|
96 | |||
96 |
< |
|
97 | <div style="margin: 0; font-weight: bold"> | |
97 | <div style="margin-bottom: 4px"> |
|
98 | <div class="clear-both" style="margin-bottom: 4px"> | |
98 | <span style="color:#7E7F7F">@${h.person(user.username)}</span> |
|
99 | <span style="color:#7E7F7F">@${h.person(user.username)}</span> | |
99 | ${_('left a')} |
|
100 | ${_('left a')} | |
100 | <a href="${commit_comment_url}" style="${base.link_css()}"> |
|
101 | <a href="${commit_comment_url}" style="${base.link_css()}"> | |
@@ -107,13 +108,14 b' data = {' | |||||
107 | </div> |
|
108 | </div> | |
108 | <div style="margin-top: 10px"></div> |
|
109 | <div style="margin-top: 10px"></div> | |
109 | ${_('Commit')} <code>${data['commit_id']}</code> ${_('of repository')}: ${data['repo_name']} |
|
110 | ${_('Commit')} <code>${data['commit_id']}</code> ${_('of repository')}: ${data['repo_name']} | |
110 |
</ |
|
111 | </div> | |
111 |
|
112 | |||
112 | </td> |
|
113 | </td> | |
113 | </tr> |
|
114 | </tr> | |
114 |
|
115 | |||
115 | </table> |
|
116 | </table> | |
116 |
|
117 | <div class="clear-both"></div> | ||
|
118 | ## main body | |||
117 | <table style="text-align:left;vertical-align:middle;width: 100%"> |
|
119 | <table style="text-align:left;vertical-align:middle;width: 100%"> | |
118 |
|
120 | |||
119 | ## spacing def |
|
121 | ## spacing def |
@@ -110,12 +110,13 b' data = {' | |||||
110 | } |
|
110 | } | |
111 | %> |
|
111 | %> | |
112 |
|
112 | |||
|
113 | ## header | |||
113 | <table style="text-align:left;vertical-align:middle;width: 100%"> |
|
114 | <table style="text-align:left;vertical-align:middle;width: 100%"> | |
114 | <tr> |
|
115 | <tr> | |
115 | <td style="width:100%;border-bottom:1px solid #dbd9da;"> |
|
116 | <td style="width:100%;border-bottom:1px solid #dbd9da;"> | |
116 |
|
117 | |||
117 |
< |
|
118 | <div style="margin: 0; font-weight: bold"> | |
118 | <div style="margin-bottom: 4px"> |
|
119 | <div class="clear-both" style="margin-bottom: 4px"> | |
119 | <span style="color:#7E7F7F">@${h.person(user.username)}</span> |
|
120 | <span style="color:#7E7F7F">@${h.person(user.username)}</span> | |
120 | ${_('left a')} |
|
121 | ${_('left a')} | |
121 | <a href="${pr_comment_url}" style="${base.link_css()}"> |
|
122 | <a href="${pr_comment_url}" style="${base.link_css()}"> | |
@@ -128,13 +129,14 b' data = {' | |||||
128 | </div> |
|
129 | </div> | |
129 | <div style="margin-top: 10px"></div> |
|
130 | <div style="margin-top: 10px"></div> | |
130 | ${_('Pull request')} <code>!${data['pr_id']}: ${data['pr_title']}</code> |
|
131 | ${_('Pull request')} <code>!${data['pr_id']}: ${data['pr_title']}</code> | |
131 |
</ |
|
132 | </div> | |
132 |
|
133 | |||
133 | </td> |
|
134 | </td> | |
134 | </tr> |
|
135 | </tr> | |
135 |
|
136 | |||
136 | </table> |
|
137 | </table> | |
137 |
|
138 | <div class="clear-both"></div> | ||
|
139 | ## main body | |||
138 | <table style="text-align:left;vertical-align:middle;width: 100%"> |
|
140 | <table style="text-align:left;vertical-align:middle;width: 100%"> | |
139 |
|
141 | |||
140 | ## spacing def |
|
142 | ## spacing def |
@@ -72,13 +72,13 b' data = {' | |||||
72 | 'target_repo_url': h.link_to(pull_request_target_repo.repo_name, pull_request_target_repo_url), |
|
72 | 'target_repo_url': h.link_to(pull_request_target_repo.repo_name, pull_request_target_repo_url), | |
73 | } |
|
73 | } | |
74 | %> |
|
74 | %> | |
75 |
|
75 | ## header | ||
76 | <table style="text-align:left;vertical-align:middle;width: 100%"> |
|
76 | <table style="text-align:left;vertical-align:middle;width: 100%"> | |
77 | <tr> |
|
77 | <tr> | |
78 | <td style="width:100%;border-bottom:1px solid #dbd9da;"> |
|
78 | <td style="width:100%;border-bottom:1px solid #dbd9da;"> | |
79 |
|
79 | |||
80 |
< |
|
80 | <div style="margin: 0; font-weight: bold"> | |
81 | <div style="margin-bottom: 4px"> |
|
81 | <div class="clear-both" class="clear-both" style="margin-bottom: 4px"> | |
82 | <span style="color:#7E7F7F">@${h.person(user.username)}</span> |
|
82 | <span style="color:#7E7F7F">@${h.person(user.username)}</span> | |
83 | ${_('requested a')} |
|
83 | ${_('requested a')} | |
84 | <a href="${pull_request_url}" style="${base.link_css()}"> |
|
84 | <a href="${pull_request_url}" style="${base.link_css()}"> | |
@@ -87,13 +87,14 b' data = {' | |||||
87 | </div> |
|
87 | </div> | |
88 | <div style="margin-top: 10px"></div> |
|
88 | <div style="margin-top: 10px"></div> | |
89 | ${_('Pull request')} <code>!${data['pr_id']}: ${data['pr_title']}</code> |
|
89 | ${_('Pull request')} <code>!${data['pr_id']}: ${data['pr_title']}</code> | |
90 |
</ |
|
90 | </div> | |
91 |
|
91 | |||
92 | </td> |
|
92 | </td> | |
93 | </tr> |
|
93 | </tr> | |
94 |
|
94 | |||
95 | </table> |
|
95 | </table> | |
96 |
|
96 | <div class="clear-both"></div> | ||
|
97 | ## main body | |||
97 | <table style="text-align:left;vertical-align:middle;width: 100%"> |
|
98 | <table style="text-align:left;vertical-align:middle;width: 100%"> | |
98 | ## spacing def |
|
99 | ## spacing def | |
99 | <tr> |
|
100 | <tr> |
@@ -85,12 +85,13 b' data = {' | |||||
85 | } |
|
85 | } | |
86 | %> |
|
86 | %> | |
87 |
|
87 | |||
|
88 | ## header | |||
88 | <table style="text-align:left;vertical-align:middle;width: 100%"> |
|
89 | <table style="text-align:left;vertical-align:middle;width: 100%"> | |
89 | <tr> |
|
90 | <tr> | |
90 | <td style="width:100%;border-bottom:1px solid #dbd9da;"> |
|
91 | <td style="width:100%;border-bottom:1px solid #dbd9da;"> | |
91 |
|
92 | |||
92 |
< |
|
93 | <div style="margin: 0; font-weight: bold"> | |
93 | <div style="margin-bottom: 4px"> |
|
94 | <div class="clear-both" style="margin-bottom: 4px"> | |
94 | <span style="color:#7E7F7F">@${h.person(updating_user.username)}</span> |
|
95 | <span style="color:#7E7F7F">@${h.person(updating_user.username)}</span> | |
95 | ${_('updated')} |
|
96 | ${_('updated')} | |
96 | <a href="${pull_request_url}" style="${base.link_css()}"> |
|
97 | <a href="${pull_request_url}" style="${base.link_css()}"> | |
@@ -99,13 +100,14 b' data = {' | |||||
99 | </div> |
|
100 | </div> | |
100 | <div style="margin-top: 10px"></div> |
|
101 | <div style="margin-top: 10px"></div> | |
101 | ${_('Pull request')} <code>!${data['pr_id']}: ${data['pr_title']}</code> |
|
102 | ${_('Pull request')} <code>!${data['pr_id']}: ${data['pr_title']}</code> | |
102 |
</ |
|
103 | </div> | |
103 |
|
104 | |||
104 | </td> |
|
105 | </td> | |
105 | </tr> |
|
106 | </tr> | |
106 |
|
107 | |||
107 | </table> |
|
108 | </table> | |
108 |
|
109 | <div class="clear-both"></div> | ||
|
110 | ## main body | |||
109 | <table style="text-align:left;vertical-align:middle;width: 100%"> |
|
111 | <table style="text-align:left;vertical-align:middle;width: 100%"> | |
110 | ## spacing def |
|
112 | ## spacing def | |
111 | <tr> |
|
113 | <tr> | |
@@ -137,27 +139,31 b' data = {' | |||||
137 | </tr> |
|
139 | </tr> | |
138 | <tr> |
|
140 | <tr> | |
139 | <td style="padding-right:20px;">${_('Changes')}:</td> |
|
141 | <td style="padding-right:20px;">${_('Changes')}:</td> | |
140 | <td style="white-space:pre-line">\ |
|
142 | <td> | |
141 |
|
|
143 | <strong>Changed commits:</strong> | |
142 |
|
144 | <ul class="changes-ul"> | ||
143 | - Added: ${len(added_commits)} |
|
145 | <li>- Added: ${len(added_commits)}</li> | |
144 | - Removed: ${len(removed_commits)} |
|
146 | <li>- Removed: ${len(removed_commits)}</li> | |
|
147 | </ul> | |||
145 |
|
148 | |||
146 | <strong>Changed files:</strong> |
|
149 | <strong>Changed files:</strong> | |
|
150 | <ul class="changes-ul"> | |||
147 |
|
151 | |||
148 | %if not changed_files: |
|
152 | %if not changed_files: | |
149 | No file changes found |
|
153 | <li>No file changes found</li> | |
150 | %else: |
|
154 | %else: | |
151 | %for file_name in added_files: |
|
155 | %for file_name in added_files: | |
152 | - A <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a> |
|
156 | <li>- A <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a></li> | |
153 | %endfor |
|
157 | %endfor | |
154 | %for file_name in modified_files: |
|
158 | %for file_name in modified_files: | |
155 | - M <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a> |
|
159 | <li>- M <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a></li> | |
156 | %endfor |
|
160 | %endfor | |
157 | %for file_name in removed_files: |
|
161 | %for file_name in removed_files: | |
158 | - R <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a> |
|
162 | <li>- R <a href="${pull_request_url + '#a_' + h.FID(ancestor_commit_id, file_name)}">${file_name}</a></li> | |
159 | %endfor |
|
163 | %endfor | |
160 | %endif |
|
164 | %endif | |
|
165 | ||||
|
166 | </ul> | |||
161 | </td> |
|
167 | </td> | |
162 | </tr> |
|
168 | </tr> | |
163 |
|
169 |
@@ -19,7 +19,7 b' A new user `${user.username}` has regist' | |||||
19 | ${self.plaintext_footer()} |
|
19 | ${self.plaintext_footer()} | |
20 | </%def> |
|
20 | </%def> | |
21 |
|
21 | |||
22 |
|
22 | ## header | ||
23 | <table style="text-align:left;vertical-align:middle;width: 100%"> |
|
23 | <table style="text-align:left;vertical-align:middle;width: 100%"> | |
24 | <tr> |
|
24 | <tr> | |
25 | <td style="width:100%;border-bottom:1px solid #dbd9da;"> |
|
25 | <td style="width:100%;border-bottom:1px solid #dbd9da;"> | |
@@ -31,7 +31,8 b' A new user `${user.username}` has regist' | |||||
31 | </td> |
|
31 | </td> | |
32 | </tr> |
|
32 | </tr> | |
33 | </table> |
|
33 | </table> | |
34 |
|
34 | <div class="clear-both"></div> | ||
|
35 | ## main body | |||
35 | <table style="text-align:left;vertical-align:middle;width: 100%"> |
|
36 | <table style="text-align:left;vertical-align:middle;width: 100%"> | |
36 | ## spacing def |
|
37 | ## spacing def | |
37 | <tr> |
|
38 | <tr> |
@@ -36,8 +36,7 b'' | |||||
36 | <ul> |
|
36 | <ul> | |
37 | <li class="breadcrumb-path"> |
|
37 | <li class="breadcrumb-path"> | |
38 | <div> |
|
38 | <div> | |
39 | <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> / |
|
39 | ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.f_path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True, hide_last_item=False, linkify_last_item=True, copy_path_icon=False)} / | |
40 | <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path)}">${c.f_path}</a> ${('/' if c.f_path else '')} |
|
|||
41 | </div> |
|
40 | </div> | |
42 | </li> |
|
41 | </li> | |
43 | <li class="location-path"> |
|
42 | <li class="location-path"> |
@@ -64,10 +64,10 b'' | |||||
64 | %if c.readme_data: |
|
64 | %if c.readme_data: | |
65 | <div id="readme" class="anchor"> |
|
65 | <div id="readme" class="anchor"> | |
66 | <div class="box"> |
|
66 | <div class="box"> | |
67 |
<div class="readme-title" title="${h.tooltip(_('Readme file from commit %s:%s') % (c.rhodecode_db_repo.landing_re |
|
67 | <div class="readme-title" title="${h.tooltip(_('Readme file from commit %s:%s') % (c.rhodecode_db_repo.landing_ref_type, c.rhodecode_db_repo.landing_ref_name))}"> | |
68 | <div> |
|
68 | <div> | |
69 | <i class="icon-file-text"></i> |
|
69 | <i class="icon-file-text"></i> | |
70 |
<a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.rhodecode_db_repo.landing_re |
|
70 | <a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.rhodecode_db_repo.landing_ref_name,f_path=c.readme_file)}"> | |
71 | ${c.readme_file} |
|
71 | ${c.readme_file} | |
72 | </a> |
|
72 | </a> | |
73 | </div> |
|
73 | </div> |
@@ -1,10 +1,13 b'' | |||||
1 | <%namespace name="base" file="/base/base.mako"/> |
|
1 | <%namespace name="base" file="/base/base.mako"/> | |
2 |
|
2 | |||
3 | <% |
|
3 | <% | |
4 |
|
|
4 | at_ref = request.GET.get('at') | |
5 | query={'at': request.GET.get('at')} |
|
5 | if at_ref: | |
|
6 | query={'at': at_ref} | |||
|
7 | default_landing_ref = at_ref or c.rhodecode_db_repo.landing_ref_name | |||
6 | else: |
|
8 | else: | |
7 | query=None |
|
9 | query=None | |
|
10 | default_landing_ref = c.commit.raw_id | |||
8 | %> |
|
11 | %> | |
9 | <div id="file-tree-wrapper" class="browser-body ${('full-load' if c.full_load else '')}"> |
|
12 | <div id="file-tree-wrapper" class="browser-body ${('full-load' if c.full_load else '')}"> | |
10 | <table class="code-browser rctable repo_summary"> |
|
13 | <table class="code-browser rctable repo_summary"> | |
@@ -21,7 +24,7 b'' | |||||
21 | <tbody id="tbody"> |
|
24 | <tbody id="tbody"> | |
22 | <tr> |
|
25 | <tr> | |
23 | <td colspan="5"> |
|
26 | <td colspan="5"> | |
24 | ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path, request.GET.get('at'), limit_items=True)} |
|
27 | ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True)} | |
25 | </td> |
|
28 | </td> | |
26 | </tr> |
|
29 | </tr> | |
27 |
|
30 | |||
@@ -41,7 +44,7 b'' | |||||
41 | % endif |
|
44 | % endif | |
42 | </span> |
|
45 | </span> | |
43 | % else: |
|
46 | % else: | |
44 |
<a href="${h.r |
|
47 | <a href="${h.repo_files_by_ref_url(c.repo_name, c.rhodecode_db_repo.repo_type, f_path=h.safe_unicode(node.path), ref_name=default_landing_ref, commit_id=c.commit.raw_id, query=query)}"> | |
45 | <i class="${('icon-file-text browser-file' if node.is_file() else 'icon-directory browser-dir')}"></i>${node.name} |
|
48 | <i class="${('icon-file-text browser-file' if node.is_file() else 'icon-directory browser-dir')}"></i>${node.name} | |
46 | </a> |
|
49 | </a> | |
47 | % endif |
|
50 | % endif |
@@ -35,8 +35,7 b'' | |||||
35 | <div class="path-items"> |
|
35 | <div class="path-items"> | |
36 | <li class="breadcrumb-path"> |
|
36 | <li class="breadcrumb-path"> | |
37 | <div> |
|
37 | <div> | |
38 | <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> / |
|
38 | ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True, hide_last_item=True, copy_path_icon=False)} / | |
39 | <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.file.dir_path)}">${c.file.dir_path}</a> ${('/' if c.file.dir_path else '')} |
|
|||
40 | </div> |
|
39 | </div> | |
41 | </li> |
|
40 | </li> | |
42 | <li class="location-path"> |
|
41 | <li class="location-path"> |
@@ -36,8 +36,7 b'' | |||||
36 | <ul> |
|
36 | <ul> | |
37 | <li class="breadcrumb-path"> |
|
37 | <li class="breadcrumb-path"> | |
38 | <div> |
|
38 | <div> | |
39 | <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> / |
|
39 | ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True, hide_last_item=True, copy_path_icon=False)} / | |
40 | <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.file.dir_path)}">${c.file.dir_path}</a> ${('/' if c.file.dir_path else '')} |
|
|||
41 | </div> |
|
40 | </div> | |
42 | </li> |
|
41 | </li> | |
43 | <li class="location-path"> |
|
42 | <li class="location-path"> |
@@ -1,5 +1,15 b'' | |||||
1 | <%namespace name="sourceblock" file="/codeblocks/source.mako"/> |
|
1 | <%namespace name="sourceblock" file="/codeblocks/source.mako"/> | |
2 |
|
2 | |||
|
3 | <% | |||
|
4 | at_ref = request.GET.get('at') | |||
|
5 | if at_ref: | |||
|
6 | query={'at': at_ref} | |||
|
7 | default_commit_id = at_ref or c.rhodecode_db_repo.landing_ref_name | |||
|
8 | else: | |||
|
9 | query=None | |||
|
10 | default_commit_id = c.commit.raw_id | |||
|
11 | %> | |||
|
12 | ||||
3 | <div id="codeblock" class="browserblock"> |
|
13 | <div id="codeblock" class="browserblock"> | |
4 | <div class="browser-header"> |
|
14 | <div class="browser-header"> | |
5 | <div class="browser-nav"> |
|
15 | <div class="browser-nav"> | |
@@ -27,13 +37,13 b'' | |||||
27 | ## binary files are delete only |
|
37 | ## binary files are delete only | |
28 | % if c.file.is_binary: |
|
38 | % if c.file.is_binary: | |
29 | ${h.link_to(_('Edit'), '#Edit', class_="btn btn-default disabled tooltip", title=_('Editing binary files not allowed'))} |
|
39 | ${h.link_to(_('Edit'), '#Edit', class_="btn btn-default disabled tooltip", title=_('Editing binary files not allowed'))} | |
30 | ${h.link_to(_('Delete'), h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path),class_="btn btn-danger")} |
|
40 | ${h.link_to(_('Delete'), h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _query=query),class_="btn btn-danger")} | |
31 | % else: |
|
41 | % else: | |
32 | <a class="btn btn-default" href="${h.route_path('repo_files_edit_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path)}"> |
|
42 | <a class="btn btn-default" href="${h.route_path('repo_files_edit_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _query=query)}"> | |
33 | ${_('Edit on branch: ')}<code>${c.branch_name}</code> |
|
43 | ${_('Edit on branch: ')}<code>${c.branch_name}</code> | |
34 | </a> |
|
44 | </a> | |
35 |
|
45 | |||
36 | <a class="btn btn-danger" href="${h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path)}"> |
|
46 | <a class="btn btn-danger" href="${h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _query=query)}"> | |
37 | ${_('Delete')} |
|
47 | ${_('Delete')} | |
38 | </a> |
|
48 | </a> | |
39 | % endif |
|
49 | % endif | |
@@ -88,7 +98,7 b'' | |||||
88 |
|
98 | |||
89 | <div class="path clear-fix"> |
|
99 | <div class="path clear-fix"> | |
90 | <div class="pull-left"> |
|
100 | <div class="pull-left"> | |
91 | ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path, request.GET.get('at'))} |
|
101 | ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'))} | |
92 | </div> |
|
102 | </div> | |
93 |
|
103 | |||
94 | <div class="pull-right stats"> |
|
104 | <div class="pull-right stats"> | |
@@ -104,7 +114,7 b'' | |||||
104 | | ${h.link_to(_('Raw'), h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))} |
|
114 | | ${h.link_to(_('Raw'), h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))} | |
105 | % if not c.file.is_binary: |
|
115 | % if not c.file.is_binary: | |
106 | |<a href="#copySource" onclick="return false;" class="no-grey clipboard-action" data-clipboard-text="${c.file.content}">${_('Copy content')}</a> |
|
116 | |<a href="#copySource" onclick="return false;" class="no-grey clipboard-action" data-clipboard-text="${c.file.content}">${_('Copy content')}</a> | |
107 |
|<a href="#copy |
|
117 | |<a href="#copyPermaLink" onclick="return false;" class="no-grey clipboard-action" data-clipboard-text="${h.route_url('repo_files', repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">${_('Copy permalink')}</a> | |
108 | % endif |
|
118 | % endif | |
109 |
|
119 | |||
110 | </div> |
|
120 | </div> |
@@ -476,7 +476,7 b'' | |||||
476 | <div class="alert alert-info"> |
|
476 | <div class="alert alert-info"> | |
477 | <div> |
|
477 | <div> | |
478 | % if c.pr_merge_source_commit.changed: |
|
478 | % if c.pr_merge_source_commit.changed: | |
479 | <strong>${_('There are new changes for {}:{} in source repository, please consider updating this pull request.').format(c.pr_merge_source_commit.ref_spec.type, c.pr_merge_source_commit.ref_spec.name)}</strong> |
|
479 | <strong>${_('There are new changes for `{}:{}` in source repository, please consider updating this pull request.').format(c.pr_merge_source_commit.ref_spec.type, c.pr_merge_source_commit.ref_spec.name)}</strong> | |
480 | % endif |
|
480 | % endif | |
481 | </div> |
|
481 | </div> | |
482 | </div> |
|
482 | </div> |
@@ -93,7 +93,7 b'' | |||||
93 |
|
93 | |||
94 | <div class="path clear-fix"> |
|
94 | <div class="path clear-fix"> | |
95 | <div class="pull-left"> |
|
95 | <div class="pull-left"> | |
96 | ${h.files_breadcrumbs(entry['repository'],entry.get('commit_id', 'tip'),entry['f_path'], linkify_last_item=True)} |
|
96 | ${h.files_breadcrumbs(entry['repository'], repo_type, entry.get('commit_id', 'tip'), entry['f_path'], linkify_last_item=True)} | |
97 | </div> |
|
97 | </div> | |
98 |
|
98 | |||
99 | <div class="pull-right stats"> |
|
99 | <div class="pull-right stats"> |
@@ -27,7 +27,7 b'' | |||||
27 | <td class="td-componentname"> |
|
27 | <td class="td-componentname"> | |
28 | <i class="icon-file"></i> |
|
28 | <i class="icon-file"></i> | |
29 | ${h.link_to(h.literal(entry['f_path']), |
|
29 | ${h.link_to(h.literal(entry['f_path']), | |
30 | h.route_path('repo_files',repo_name=entry['repository'],commit_id='tip',f_path=entry['f_path']))} |
|
30 | h.route_path('repo_files',repo_name=entry['repository'],commit_id=entry.get('commit_id', 'tip'),f_path=entry['f_path']))} | |
31 | </td> |
|
31 | </td> | |
32 | <td> |
|
32 | <td> | |
33 | %if entry.get('size'): |
|
33 | %if entry.get('size'): |
@@ -34,10 +34,10 b'' | |||||
34 | <div id="readme" class="anchor"> |
|
34 | <div id="readme" class="anchor"> | |
35 | <div class="box"> |
|
35 | <div class="box"> | |
36 |
|
36 | |||
37 |
<div class="readme-title" title="${h.tooltip(_('Readme file from commit %s:%s') % (c.rhodecode_db_repo.landing_re |
|
37 | <div class="readme-title" title="${h.tooltip(_('Readme file from commit %s:%s') % (c.rhodecode_db_repo.landing_ref_type, c.rhodecode_db_repo.landing_ref_name))}"> | |
38 | <div> |
|
38 | <div> | |
39 | <i class="icon-file-text"></i> |
|
39 | <i class="icon-file-text"></i> | |
40 |
<a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.rhodecode_db_repo.landing_re |
|
40 | <a href="${h.route_path('repo_files',repo_name=c.repo_name,commit_id=c.rhodecode_db_repo.landing_ref_name,f_path=c.readme_file)}"> | |
41 | ${c.readme_file} |
|
41 | ${c.readme_file} | |
42 | </a> |
|
42 | </a> | |
43 | </div> |
|
43 | </div> |
@@ -82,9 +82,8 b' def test_urlify_text(url, expected_url):' | |||||
82 | 'bX"X'), |
|
82 | 'bX"X'), | |
83 |
|
83 | |||
84 | ], ids=['simple1', 'simple2', 'one_segment', 'empty_path', 'simple_quote']) |
|
84 | ], ids=['simple1', 'simple2', 'one_segment', 'empty_path', 'simple_quote']) | |
85 | def test_files_breadcrumbs_xss( |
|
85 | def test_files_breadcrumbs_xss(repo_name, commit_id, path, app, expected_result): | |
86 | repo_name, commit_id, path, app, expected_result): |
|
86 | result = helpers.files_breadcrumbs(repo_name, 'hg', commit_id, path) | |
87 | result = helpers.files_breadcrumbs(repo_name, commit_id, path) |
|
|||
88 | # Expect it to encode all path fragments properly. This is important |
|
87 | # Expect it to encode all path fragments properly. This is important | |
89 | # because it returns an instance of `literal`. |
|
88 | # because it returns an instance of `literal`. | |
90 | if path != '': |
|
89 | if path != '': |
General Comments 0
You need to be logged in to leave comments.
Login now