Fix Bug 1666199 Unify download URL schema #1692
Conversation
1)Changed the url for translation memory (line 133) in UserMenu.js file 2)Changed the url for translations (line 153) in UserMenu.js file 3)Removed the parameters locale and slug passed in the url for downloading translation memory (line 59) in pontoon/base/ urls.py 4)Modified the view download_translation_memory in pontoon/base/views.py to accept only 2 parameters i.e. request and filename and introduced a new variable vars to extract locale and slug using split function. 5)Changed the view name download in pontoon/base/views.py to translations (line 694) and changed the urls,name corresponding to it in pontoon/base/ urls.py (line 81)
pontoon/base/urls.py
Outdated
| @@ -56,7 +56,7 @@ | |||
| ), | |||
| # Download translation memory | |||
| url( | |||
| r"^(?P<locale>[A-Za-z0-9\-\@\.]+)/(?P<slug>[\w-]+)/(?P<filename>.+)\.tmx$", | |||
| r"^translation-memory/(?P<filename>.+)\.tmx$", | |||
There was a problem hiding this comment.
hey @anujpandey785
The patch looks good, but I have a small suggestion that potentially can reduce the amount of code.
The regex for this contains a variable that can be removed because it gets overridden in the view.
r"^translation-memory/(?P<locale>[A-Za-z0-9\-\@\.]+)\.(?P<slug>[\w-]+)\.tmx$",
I think it's safe to leave only locale and slug as the view parameters.
There was a problem hiding this comment.
Hii @jotes
Thanks for reviewing the patch .Sorry, I had overlooked the fact that the variable filename is being overridden. Yeah that helps us reducing 5 lines of code I have made the suggested changes , pushing the changes now. Tysm :)
There was a problem hiding this comment.
@jotes Done
But as we have changed the url for downloading the translational memory it would have its effect on button for downloading translation memory located in the project dashboard as well , we should change the url there too ?
Also, I am not sure about what's causing it but the tests which are failing in the Travis CI, do we also need to make changes in the code for the failing test cases( the test_tmx.py file ) ?
There was a problem hiding this comment.
I'll take a look at it today :-)
There was a problem hiding this comment.
Okay, the tests are failing because of the changes in the URLs. I think it's a good idea to use reverse and replace the hardcoded URLs.
There was a problem hiding this comment.
Okay, the tests are failing because of the changes in the URLs. I think it's a good idea to use reverse and replace the hardcoded URLs.
Thanks for the suggestion. I am working on it.
1)Restored the variables locale and slug and deleted the variable filename (as it is being overridden in the view) from the regex passed in the url for downloading translational memory (line 59) in the file pontoon/base/urls.py 2)Consequently added locale and slug parameters and removed the filename parameter in the view download_translation_memory (line 758) in the file pontoon/base/views.py
pontoon/base/urls.py
Outdated
| @@ -78,7 +78,7 @@ | |||
| views.get_translations_from_other_locales, | |||
| name="pontoon.other_locales", | |||
| ), | |||
| url(r"^download/", views.download, name="pontoon.download"), | |||
| url(r"^translations/", views.translations, name="pontoon.translations"), | |||
There was a problem hiding this comment.
I'd make that less ambiguous. Maybe views.download_translations and pontoon.download.translations?
There was a problem hiding this comment.
- Yeah , i should have taken a hint from
download_translation_memory
@mathjazz Could you please elaborate more about the error in this part as i am able to download translations in my local copy.
|
Correct. |
1)Modified the harcoded url in the download button on the dashboard to Download Translation Memory in heading_info.html(Line 145) 2)Changed the view name for download translations from ```translations``` to ```download_translations`` also made corresponding changes to view name to ```pontoon.download.translations``` in base/urls.py (Line 83 and 84) 3)Modified test_tmx.py namely the tests named ``` test_view_tmx_locale_file_dl``` and ```test_view_tmx_bad_params``` by removing the hardcoded urls and making use of reverse.
1)Changed the url for translation memory (line 133) in UserMenu.js file
2)Changed the url for translations (line 153) in UserMenu.js file
3)Removed the parameters locale and slug passed in the url for
downloading translation memory (line 59) in pontoon/base/ urls.py
4)Modified the view download_translation_memory in pontoon/base/views.py
to accept only 2 parameters i.e. request and filename and introduced a
new variable vars to extract locale and slug using split function.
5)Changed the view name download in pontoon/base/views.py to translations
(line 694) and changed the urls,name corresponding to it in
pontoon/base/ urls.py (line 81)