-
Notifications
You must be signed in to change notification settings - Fork 52
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upgrade django version from 4.2 to 5.1 #375
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
js_catalog_template = r""" | ||
{% autoescape off %} | ||
'use strict'; | ||
{ | ||
const globals = this; | ||
const django = globals.django || (globals.django = {}); | ||
|
||
{% if plural %} | ||
django.pluralidx = function(n) { | ||
const v = {{ plural }}; | ||
if (typeof v === 'boolean') { | ||
return v ? 1 : 0; | ||
} else { | ||
return v; | ||
} | ||
}; | ||
{% else %} | ||
django.pluralidx = function(count) { return (count == 1) ? 0 : 1; }; | ||
{% endif %} | ||
|
||
/* gettext library */ | ||
|
||
django.catalog = django.catalog || {}; | ||
{% if catalog_str %} | ||
const newcatalog = {{ catalog_str }}; | ||
for (const key in newcatalog) { | ||
django.catalog[key] = newcatalog[key]; | ||
} | ||
{% endif %} | ||
|
||
if (!django.jsi18n_initialized) { | ||
django.gettext = function(msgid) { | ||
const value = django.catalog[msgid]; | ||
if (typeof value === 'undefined') { | ||
return msgid; | ||
} else { | ||
return (typeof value === 'string') ? value : value[0]; | ||
} | ||
}; | ||
|
||
django.ngettext = function(singular, plural, count) { | ||
const value = django.catalog[singular]; | ||
if (typeof value === 'undefined') { | ||
return (count == 1) ? singular : plural; | ||
} else { | ||
return value.constructor === Array ? value[django.pluralidx(count)] : value; | ||
} | ||
}; | ||
|
||
django.gettext_noop = function(msgid) { return msgid; }; | ||
|
||
django.pgettext = function(context, msgid) { | ||
let value = django.gettext(context + '\x04' + msgid); | ||
if (value.includes('\x04')) { | ||
value = msgid; | ||
} | ||
return value; | ||
}; | ||
|
||
django.npgettext = function(context, singular, plural, count) { | ||
let value = django.ngettext(context + '\x04' + singular, context + '\x04' + plural, count); | ||
if (value.includes('\x04')) { | ||
value = django.ngettext(singular, plural, count); | ||
} | ||
return value; | ||
}; | ||
|
||
django.interpolate = function(fmt, obj, named) { | ||
if (named) { | ||
return fmt.replace(/%\(\w+\)s/g, function(match){return String(obj[match.slice(2,-2)])}); | ||
} else { | ||
return fmt.replace(/%s/g, function(match){return String(obj.shift())}); | ||
} | ||
}; | ||
|
||
|
||
/* formatting library */ | ||
|
||
django.formats = {{ formats_str }}; | ||
|
||
django.get_format = function(format_type) { | ||
const value = django.formats[format_type]; | ||
if (typeof value === 'undefined') { | ||
return format_type; | ||
} else { | ||
return value; | ||
} | ||
}; | ||
|
||
/* add to global namespace */ | ||
globals.pluralidx = django.pluralidx; | ||
globals.gettext = django.gettext; | ||
globals.ngettext = django.ngettext; | ||
globals.gettext_noop = django.gettext_noop; | ||
globals.pgettext = django.pgettext; | ||
globals.npgettext = django.npgettext; | ||
globals.interpolate = django.interpolate; | ||
globals.get_format = django.get_format; | ||
|
||
django.jsi18n_initialized = true; | ||
} | ||
}; | ||
{% endautoescape %} | ||
""" # NOQA |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
issue (complexity): Consider refactoring the large template string into smaller, more manageable pieces.
While the internationalization functionality is crucial, the current implementation mixes Python and JavaScript in a way that could lead to maintainability issues. Consider the following improvements:
This approach maintains the benefits of keeping related logic together while significantly improving readability and maintainability. It allows for easier updates to specific parts of the internationalization logic and makes the code more modular without necessarily splitting it into separate files.