Skip to content

Commit 3f7b19b

Browse files
committed
use Arabic/Persian numerals for Version Names where it works cleanly
1 parent 04588fb commit 3f7b19b

File tree

2 files changed

+33
-32
lines changed

2 files changed

+33
-32
lines changed

_layouts/package.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ <h3 class="package-name">
2323
{% if page.whats_new and page.suggested_version_name %}
2424
<div class="package-whats-new">
2525
{% assign fmt_latest_version = '{{ latest_version }}' %}
26-
<div class="new-in-version">{{ strings.new_in_version | replace: fmt_latest_version, page.suggested_version_name }}</div>
26+
{% assign version_name = page.suggested_version_name | i18n_number %}
27+
<div class="new-in-version">{{ strings.new_in_version | replace: fmt_latest_version, version_name }}</div>
2728
<div dir="auto">
2829
{{ page.whats_new }}
2930
</div>
@@ -182,9 +183,10 @@ <h3>{{ strings.versions }}</h3>
182183
<a name="{{ package.version_code }}"></a>
183184
{% comment %}fmt_package_version_* are strings in the JSON that are replaced here{% endcomment %}
184185
{% assign fmt_package_version = '{{ package_version }}' %}
186+
{% assign version_name = package.version_name | i18n_number %}
185187
{% assign fmt_package_version_code = '{{ package_version_code }}' %}
186188
{% assign version_code = package.version_code | i18n_number %}
187-
{{ strings.version_info | replace: fmt_package_version, package.version_name | replace: fmt_package_version_code, version_code }}
189+
{{ strings.version_info | replace: fmt_package_version, version_name | replace: fmt_package_version_code, version_code }}
188190
{% if page.suggested_version_name == package.version_name and suggestedDisplayed != true %}<span class="suggested-badge">{{ strings.suggested }}</span>{% assign suggestedDisplayed = true %}{% else %} - {% endif %}
189191
{% assign fmt_package_added_date = '{{ package_added_date }}' %}
190192
{{ strings.added_on | replace: fmt_package_added_date, package_added_date }}

_plugins/fdroid-filters.rb

+29-30
Original file line numberDiff line numberDiff line change
@@ -66,37 +66,36 @@ def android_sdk_level_to_version(input)
6666

6767
def i18n_number(number)
6868
site = @context.registers[:site]
69-
if site.active_lang == 'ar'
70-
number.to_s.gsub(/[0-9.]/,
71-
'0'=>"\u{0660}",
72-
'1'=>"\u{0661}",
73-
'2'=>"\u{0662}",
74-
'3'=>"\u{0663}",
75-
'4'=>"\u{0664}",
76-
'5'=>"\u{0665}",
77-
'6'=>"\u{0666}",
78-
'7'=>"\u{0667}",
79-
'8'=>"\u{0668}",
80-
'9'=>"\u{0669}",
81-
'.'=>"\u{066B}",
82-
)
83-
elsif site.active_lang == 'fa'
84-
number.to_s.gsub(/[0-9.]/,
85-
'0'=>"\u{06F0}",
86-
'1'=>"\u{06F1}",
87-
'2'=>"\u{06F2}",
88-
'3'=>"\u{06F3}",
89-
'4'=>"\u{06F4}",
90-
'5'=>"\u{06F5}",
91-
'6'=>"\u{06F6}",
92-
'7'=>"\u{06F7}",
93-
'8'=>"\u{06F8}",
94-
'9'=>"\u{06F9}",
95-
'.'=>"\u{066B}",
96-
)
97-
else
98-
number
69+
if site.active_lang == 'ar' and number.to_s.match?(/^[0-9.]+$/)
70+
return number.to_s.gsub(/[0-9.]/,
71+
'0' => "\u{0660}",
72+
'1' => "\u{0661}",
73+
'2' => "\u{0662}",
74+
'3' => "\u{0663}",
75+
'4' => "\u{0664}",
76+
'5' => "\u{0665}",
77+
'6' => "\u{0666}",
78+
'7' => "\u{0667}",
79+
'8' => "\u{0668}",
80+
'9' => "\u{0669}",
81+
'.' => "\u{066B}",
82+
)
83+
elsif site.active_lang == 'fa' and number.to_s.match?(/^[0-9.]+$/)
84+
return number.to_s.gsub(/[0-9.]/,
85+
'0' => "\u{06F0}",
86+
'1' => "\u{06F1}",
87+
'2' => "\u{06F2}",
88+
'3' => "\u{06F3}",
89+
'4' => "\u{06F4}",
90+
'5' => "\u{06F5}",
91+
'6' => "\u{06F6}",
92+
'7' => "\u{06F7}",
93+
'8' => "\u{06F8}",
94+
'9' => "\u{06F9}",
95+
'.' => "\u{066B}",
96+
)
9997
end
98+
return number # return unchanged if none of the conditions were met
10099
end
101100

102101
# Convert a file size to a human-readable String.

0 commit comments

Comments
 (0)