Jalali Calendar support #5895

qasedak · 2023-11-20T13:14:43Z

Jalali is the official calendar in Iran and Afghanistan, so it would be nice to support jalali calendar for their time zones.

Changes proposed in this pull request:

Jalali calendar for Asia/Tehran and Asia/Kabul time-zones
suitable date format for Persian and Pashto languages
use of Vazirmant font in RTL for default theme

calendar system switches from Gregorian to Jalali based on time zone

qasedak · 2023-11-20T13:22:05Z

here is FreshRSS Displaying Jalali dates

Frenzie

Thanks, that looks cool!

Frenzie · 2023-11-20T19:02:54Z

p/themes/Origine/origine.rtl.css

@@ -84,7 +84,7 @@
 html, body {
 background-color: var(--background-color-light);
 color: var(--font-color);
- font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", "PingFang SC", "Microsoft YaHei", sans-serif;
+ font-family: "Vazirmatn", "OpenSans", "Cantarell", "Helvetica", "Arial", "PingFang SC", "Microsoft YaHei", sans-serif;


The RTL files are automatically generated, so a processing directive would be better.

https://rtlcss.com/learn/getting-started/why-rtlcss/#Processing-Directives

Perhaps something like:

Suggested change

font-family: "Vazirmatn", "OpenSans", "Cantarell", "Helvetica", "Arial", "PingFang SC", "Microsoft YaHei", sans-serif;

font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", "PingFang SC", "Microsoft YaHei", sans-serif /*rtl:prepend:"Vazirmatn", */;

Er, in the non-RTL file that is, don't apply these suggestions as is. ;-)

Frenzie · 2023-11-20T19:03:38Z

p/themes/base-theme/frss.rtl.css

@@ -1,4 +1,5 @@
 @charset "UTF-8";
+@import url('https://fonts.googleapis.com/css2?family=Vazirmatn:wght@100;200;300;400;500;600;700;800;900&display=swap');


Same, but with something like:

Suggested change

@import url('https://fonts.googleapis.com/css2?family=Vazirmatn:wght@100;200;300;400;500;600;700;800;900&display=swap');

/*rtl:raw:@import url('https://fonts.googleapis.com/css2?family=Vazirmatn:wght@100;200;300;400;500;600;700;800;900&display=swap');*/

I would rather avoid a query to a Google server if possible. Could this font be exported to be used locally?

Yes it could be used locally. But first i need to look into themes structure so i can implement it better...

have a look into the CSS @font-face.
Font files are stored in the directory /p/themes/fonts

Alkarex · 2023-11-20T20:03:20Z

For internal developers: We need to find out what to do with those fonts. We might not be able to satisfy all use cases with an identical declaration (cf. e.g. #5671). Maybe a menu to change the font independently of the theme, or a list of fonts that depends on the language... What do you think @math-GH @Frenzie ?

math-GH · 2023-11-20T23:03:00Z

It is very nice to see that FreshRSS is used around the globe. It is very important that the community gives input from their language/local needs.

What could help me to understand the current situation better? @qasedak Could you please paste a screenshot here how it looks like before the PR without this specific font family?

strict_types must be on the first line

qasedak · 2023-11-21T06:24:14Z

@math-GH , the font family is no big deal it's just a more appealing font for Arabic, Persian, ...
here is the screenshot:

Frenzie · 2023-11-21T09:35:09Z

or a list of fonts that depends on the language

A UI language dependency sounds problematic to me. Even as a correlation that's quite weak.

We should probably distinguish between fonts that might be installed on the OS (is there any harm?) and web fonts (better to avoid downloading them unnecessarily).

But I would start to write it a bit differently, i.e.

font-family:
  /* generic */
  Helvetica, Tex Gyre Pagella, blah blah,
  /* Japanese */
  Mac Japanese Font, Win Japanese font,
  /* Persian */
  etc.

Maybe a menu to change the font independently of the theme

Yes, ultimately that makes the most sense to me, though I'll point out this can also quite easily be done with the CustomCSS.

app/Models/Entry.php

Alkarex · 2023-11-21T16:40:37Z

app/Models/Entry.php

 if ($raw) {
 return $this->date;
+ } else if ($userTimezone == 'Asia/Tehran' || $userTimezone == 'Asia/Kabul') {


I am not knowledgeable enough. A few points for which I have doubts:

are all users of this timezone using this calendar?

isn't this calendar used in other timezones, for instance when people travel?

In other words, I believe we might need a new selector option in the UI

are all users of this timezone using this calendar?

Indeed, that goes both ways. It could make sense as a default but it's otherwise more or less identical to the font issue.

In Iran and Afghanistan it's the official calendar. Also I like to add Hijri calendar system which is common in Arab and Islamic countries. If we add an option (like regional format in windows) for users to select their preferred calendar system it would be a better way I think.

Maybe picking another library then? https://packagist.org/?query=Jalali%20Hijri
https://github.com/fisharebest/ext-calendar seems to be quite popular and well maintained.
Could you check whether that could work for you?

Alkarex · 2023-11-21T16:42:49Z

app/views/helpers/calendars/jalali/jdf.php

+ */
+
+/* F */
+function jdate($format, $timestamp = '', $none = '', $time_zone = 'Asia/Tehran', $tr_num = 'fa') {


Is there a version of this library (or equivalent) that exists on https://packagist.org so that we could depend on it through composer?

E.g. one of https://packagist.org/?query=Jalali ?

@Alkarex I think this is the one:
https://packagist.org/packages/jalalidate/jdf
or
https://packagist.org/packages/alifti/jdf

Co-authored-by: Luc SANCHEZ <[email protected]>

qasedak added 3 commits November 20, 2023 16:10

Vazirmatn is a good font for most RTL languages

c5ede22

support for Jalali calendar added

484d15e

calendar system switches from Gregorian to Jalali based on time zone

Merge branch 'edge' into Jalali

0844ad0

Frenzie reviewed Nov 20, 2023

View reviewed changes

Alkarex added this to the 1.23.0 milestone Nov 20, 2023

Alkarex added the I18n 🌍 Translations label Nov 20, 2023

Update Entry.php

681fc92

strict_types must be on the first line

ColonelMoutarde reviewed Nov 21, 2023

View reviewed changes

app/Models/Entry.php Show resolved Hide resolved

app/Models/Entry.php Outdated Show resolved Hide resolved

Alkarex reviewed Nov 21, 2023

View reviewed changes

Alkarex mentioned this pull request Nov 21, 2023

Add Japanese to font-family #5671

Open

qasedak and others added 2 commits November 24, 2023 16:33

Update app/Models/Entry.php

762c8dd

Co-authored-by: Luc SANCHEZ <[email protected]>

Merge branch 'FreshRSS:edge' into Jalali

3c329a7

Alkarex modified the milestones: 1.23.0, 1.24.0 Nov 24, 2023

Alkarex modified the milestones: 1.24.0, 1.25.0 Feb 26, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Jalali Calendar support #5895

Jalali Calendar support #5895

qasedak commented Nov 20, 2023

qasedak commented Nov 20, 2023

Frenzie left a comment

Frenzie Nov 20, 2023

Frenzie Nov 20, 2023

Frenzie Nov 20, 2023

Alkarex Nov 20, 2023 •

edited

qasedak Nov 20, 2023

math-GH Nov 20, 2023

Alkarex commented Nov 20, 2023 •

edited

math-GH commented Nov 20, 2023

qasedak commented Nov 21, 2023

Frenzie commented Nov 21, 2023

Alkarex Nov 21, 2023

Frenzie Nov 21, 2023

qasedak Nov 22, 2023

Alkarex Nov 24, 2023 •

edited

Alkarex Nov 21, 2023 •

edited

Alkarex Nov 21, 2023

qasedak Nov 24, 2023 •

edited

	font-family: "Vazirmatn", "OpenSans", "Cantarell", "Helvetica", "Arial", "PingFang SC", "Microsoft YaHei", sans-serif;
	font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", "PingFang SC", "Microsoft YaHei", sans-serif /rtl:prepend:"Vazirmatn", /;

		@@ -1,4 +1,5 @@
		@charset "UTF-8";
		@import url('https://fonts.googleapis.com/css2?family=Vazirmatn:wght@100;200;300;400;500;600;700;800;900&display=swap');

	@import url('https://fonts.googleapis.com/css2?family=Vazirmatn:wght@100;200;300;400;500;600;700;800;900&display=swap');
	/rtl:raw:@import url('https://fonts.googleapis.com/css2?family=Vazirmatn:wght@100;200;300;400;500;600;700;800;900&display=swap');/

Jalali Calendar support #5895

Are you sure you want to change the base?

Jalali Calendar support #5895

Conversation

qasedak commented Nov 20, 2023

qasedak commented Nov 20, 2023

Frenzie left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Alkarex Nov 20, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Alkarex commented Nov 20, 2023 • edited

math-GH commented Nov 20, 2023

qasedak commented Nov 21, 2023

Frenzie commented Nov 21, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Alkarex Nov 24, 2023 • edited

Choose a reason for hiding this comment

Alkarex Nov 21, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

qasedak Nov 24, 2023 • edited

Choose a reason for hiding this comment

Alkarex Nov 20, 2023 •

edited

Alkarex commented Nov 20, 2023 •

edited

Alkarex Nov 24, 2023 •

edited

Alkarex Nov 21, 2023 •

edited

qasedak Nov 24, 2023 •

edited