Skip to content

Commit

Permalink
Merge pull request #918 from Ordisoftware/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Ordisoftware authored Sep 25, 2021
2 parents e241362 + afa81cc commit 181b88b
Show file tree
Hide file tree
Showing 24 changed files with 1,754 additions and 1,308 deletions.
3 changes: 3 additions & 0 deletions Documents/WebLinks/WebLinks-02-JewishCalendars.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ URL = https://www.aish.com/jewish-calendar/Jewish_Calendar.html
Name = (EN) Chabad.org
URL = https://www.chabad.org/calendar/view/month.htm

Name = (EN) Yeshiva.co
URL = https://www.yeshiva.co/calendar

Name = (EN) Hebcal.com
URL = https://www.hebcal.com

Expand Down
8 changes: 8 additions & 0 deletions Documents/WebLinks/WebLinks-07-OnlineLessons.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,14 @@ URL = https://www.truetorahjews.org

-

Name = (EN) My Jewish Learning
URL = https://www.myjewishlearning.com

Name = (EN) The Rabbinical Assembly
URL = https://www.rabbinicalassembly.org

-

Name = (FR) Aish
URL = https://www.aish.fr

Expand Down
3 changes: 3 additions & 0 deletions Documents/WebLinks/WebLinks-08-VideoChannels.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ URL = https://www.youtube.com/user/AishIvrit

-

Name = (EN) My Jewish Learning
URL = https://www.youtube.com/user/myjewishlearning

Name = (EN) The Yeshiva
URL = https://www.youtube.com/user/TheYeshivaNet

Expand Down
6 changes: 6 additions & 0 deletions Documents/WebProviders/WebProviders-Celebration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,18 @@ URL = https://www.chabad.org/%CHABAD-EN%
Name = (EN) Torah.org
URL = https://torah.org/%TORAHORG%/

Name = (EN) Yeshiva.co
URL = https://www.yeshiva.co/midrash/category/%YESHIVACO%

Name = (EN) TheYeshiva.net
URL = https://www.theyeshiva.net/jewish/%THEYESHIVA%

Name = (EN) TrueTorahJews.org
URL = https://www.truetorahjews.org/parsha-pearls/%TORAHJEWS%

Name = (EN) MyJewishLearning.com
URL = https://www.myjewishlearning.com/category/celebrate/%MYJEWISHLEARNING%/

-

Name = (FR) Torah-Box.com
Expand Down
9 changes: 9 additions & 0 deletions Documents/WebProviders/WebProviders-Parashah.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,18 @@ URL = https://www.chabad.org/article.aspx?aid=%CHABAD-EN%
Name = (EN) Torah.org
URL = https://torah.org/parsha/%TORAHORG%/

Name = (EN) Yeshiva.co
URL = https://www.yeshiva.co/midrash/category/%YESHIVACO%

Name = (EN) TheYeshiva.net
URL = https://www.theyeshiva.net/jewish/%THEYESHIVA%

Name = (EN) TrueTorahJews.org
URL = https://www.truetorahjews.org/parsha-pearls/%TORAHJEWS%

Name = (EN) MyJewishLearning.com
URL = https://www.myjewishlearning.com/torah-portions/%MYJEWISHLEARNING%/

-

Name = (FR) Torah-Box.com
Expand Down
6 changes: 6 additions & 0 deletions Project/Hebrew Calendar (vs2017).csproj
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,9 @@
<Compile Include="Source\Common\Hebrew\Entities\BooksNames.StudyBible.cs" />
<Compile Include="Source\Common\Hebrew\Classes\HebrewAlphabet.cs" />
<Compile Include="Source\Common\Hebrew\Classes\HebrewMonths.cs" />
<Compile Include="Source\Common\Hebrew\Entities\OnlineParashot.MyJewishLearning.cs" />
<Compile Include="Source\Common\Hebrew\Entities\OnlineParashot.TheYeshivaNet.cs" />
<Compile Include="Source\Common\Hebrew\Entities\OnlineParashot.YeshivaCo.cs" />
<Compile Include="Source\Common\Hebrew\Providers\ProviderSettings.cs" />
<Compile Include="Source\Common\Hebrew\Entities\OnlineCelebrations.cs" />
<Compile Include="Source\Common\Hebrew\Entities\OnlineParashot.AishEN.cs" />
Expand Down Expand Up @@ -540,6 +543,9 @@
<Compile Include="Source\Forms\MainForm\UI\MainForm.TrayIcon.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Source\Forms\MainForm\UI\MainForm.ContextMenu.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Source\Forms\MainForm\UI\MainForm.Weather.cs">
<SubType>Form</SubType>
</Compile>
Expand Down
4 changes: 2 additions & 2 deletions Project/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
// en utilisant '*', comme indiqué ci-dessous :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("9.4.0.0")]
[assembly: AssemblyFileVersion("9.4.0.0")]
[assembly: AssemblyVersion("9.5.0.0")]
[assembly: AssemblyFileVersion("9.5.0.0")]
15 changes: 10 additions & 5 deletions Project/Source/Common/Hebrew/Classes/HebrewTools.cs
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,16 @@ static public void OpenParashahProvider(string url, Parashah parashah, bool open
//
void open(Parashah item)
{
string link = url.Replace("%TORAHBOX%", OnlineParashot.TorahBox[item.Book][item.Number - 1])
string link = url.Replace("%WIKIPEDIA-EN%", OnlineParashot.WikipediaEN[item.Book][item.Number - 1])
.Replace("%WIKIPEDIA-FR%", OnlineParashot.WikipediaFR[item.Book][item.Number - 1])
.Replace("%TORAHBOX%", OnlineParashot.TorahBox[item.Book][item.Number - 1])
.Replace("%TORAHORG%", OnlineParashot.TorahOrg[item.Book][item.Number - 1])
.Replace("%TORAHJEWS%", OnlineParashot.TorahJews[item.Book][item.Number - 1])
.Replace("%YESHIVACO%", OnlineParashot.YeshivaCo[item.Book][item.Number - 1])
.Replace("%THEYESHIVA%", OnlineParashot.TheYeshivaNet[item.Book][item.Number - 1])
.Replace("%MYJEWISHLEARNING%", OnlineParashot.MyJewishLearning[item.Book][item.Number - 1])
.Replace("%CHABAD-EN%", OnlineParashot.ChabadEN[item.Book][item.Number - 1])
.Replace("%CHABAD-FR%", OnlineParashot.ChabadFR[item.Book][item.Number - 1])
.Replace("%WIKIPEDIA-EN%", OnlineParashot.WikipediaEN[item.Book][item.Number - 1])
.Replace("%WIKIPEDIA-FR%", OnlineParashot.WikipediaFR[item.Book][item.Number - 1])
.Replace("%AISH-EN%", OnlineParashot.AishEN[item.Book][item.Number - 1])
.Replace("%AISH-FR%", OnlineParashot.AishFR[item.Book][item.Number - 1])
.Replace("%AISH-IW%", OnlineParashot.AishIW[item.Book][item.Number - 1]);
Expand All @@ -204,11 +207,13 @@ static public void OpenCelebrationProvider(string url, TorahCelebration celebrat
{
string link = url.Replace("%WIKIPEDIA-EN%", OnlineCelebration.WikipediaEN[celebration])
.Replace("%WIKIPEDIA-FR%", OnlineCelebration.WikipediaFR[celebration])
.Replace("%TORAHORG%", OnlineCelebration.TorahOrg[celebration])
.Replace("%TORAHBOX%", OnlineCelebration.TorahBox[celebration])
.Replace("%TORAHORG%", OnlineCelebration.TorahOrg[celebration])
.Replace("%TORAHJEWS%", OnlineCelebration.TrueTorahJews[celebration])
.Replace("%LOUBAVITCH%", OnlineCelebration.Loubavitch[celebration])
.Replace("%YESHIVACO%", OnlineCelebration.YeshivaCo[celebration])
.Replace("%THEYESHIVA%", OnlineCelebration.TheYeshiva[celebration])
.Replace("%MYJEWISHLEARNING%", OnlineCelebration.MyJewishLearning[celebration])
.Replace("%LOUBAVITCH%", OnlineCelebration.Loubavitch[celebration])
.Replace("%CHABAD-EN%", OnlineCelebration.ChabadEN[celebration])
.Replace("%CHABAD-FR%", OnlineCelebration.ChabadFR[celebration])
.Replace("%AISH-EN%", OnlineCelebration.AishEN[celebration])
Expand Down
20 changes: 20 additions & 0 deletions Project/Source/Common/Hebrew/Entities/OnlineCelebrations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@ static public readonly Dictionary<TorahCelebration, string> TrueTorahJews
{ TorahCelebration.Soukot, "succos" }
};

static public readonly Dictionary<TorahCelebration, string> MyJewishLearning
= new Dictionary<TorahCelebration, string>
{
{ TorahCelebration.Pessah, "passover" },
{ TorahCelebration.Chavouot, "shavuot" },
{ TorahCelebration.YomTerouah, "rosh-hashanah" },
{ TorahCelebration.YomHaKipourim, "yom-kippur" },
{ TorahCelebration.Soukot, "sukkot" }
};

static public readonly Dictionary<TorahCelebration, string> TorahBox
= new Dictionary<TorahCelebration, string>
{
Expand Down Expand Up @@ -101,6 +111,16 @@ static public readonly Dictionary<TorahCelebration, string> ChabadEN
{ TorahCelebration.Soukot, "library/article_cdo/aid/4126/jewish/Sukkot.htm" }
};

static public readonly Dictionary<TorahCelebration, string> YeshivaCo
= new Dictionary<TorahCelebration, string>
{
{ TorahCelebration.Pessah, "103" },
{ TorahCelebration.Chavouot, "90" },
{ TorahCelebration.YomTerouah, "492" },
{ TorahCelebration.YomHaKipourim, "73" },
{ TorahCelebration.Soukot, "74" }
};

static public readonly Dictionary<TorahCelebration, string> TheYeshiva
= new Dictionary<TorahCelebration, string>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/// <license>
/// This file is part of Ordisoftware Hebrew Calendar/Letters/Words.
/// Copyright 2012-2021 Olivier Rogier.
/// See www.ordisoftware.com for more information.
/// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
/// If a copy of the MPL was not distributed with this file, You can obtain one at
/// https://mozilla.org/MPL/2.0/.
/// If it is not possible or desirable to put the notice in a particular file,
/// then You may include the notice in a location(such as a LICENSE file in a
/// relevant directory) where a recipient would be likely to look for such a notice.
/// You may add additional accurate notices of copyright ownership.
/// </license>
/// <created> 2021-09 </created>
/// <edited> 2021-09 </edited>
using System;
using Ordisoftware.Core;

namespace Ordisoftware.Hebrew
{

static partial class OnlineParashot
{

static public readonly NullSafeDictionary<TorahBook, NullSafeList<string>> MyJewishLearning
= new NullSafeDictionary<TorahBook, NullSafeList<string>>
{
[TorahBook.Bereshit] = new NullSafeList<string>
{
"parashat-bereshit",
"parashat-noach",
"parashat-lech-lecha",
"parashat-vayera",
"parashat-chayei-sara",
"parashat-toldot",
"parashat-vayetzei",
"parashat-vayishlach",
"parashat-vayeshev",
"parashat-miketz",
"parashat-vayigash",
"parashat-vayechi",
},
[TorahBook.Shemot] = new NullSafeList<string>
{
"parashat-shemot",
"parashat-vaera",
"parashat-bo",
"parashat-beshalach",
"parashat-yitro",
"parashat-mishpatim",
"parashat-terumah",
"parashat-tetzaveh",
"parashat-ki-tisa",
"parashat-vayakhel",
"parashat-pekudei",
},
[TorahBook.Vayiqra] = new NullSafeList<string>
{
"parashat-vayikra",
"parashat-tzav",
"parashat-shmini",
"parashat-tazria",
"parashat-metzora",
"parashat-achrei-mot",
"parashat-kedoshim",
"parashat-emor",
"parashat-behar",
"parashat-bechukotai",
},
[TorahBook.Bamidbar] = new NullSafeList<string>
{
"parashat-bamidbar",
"parashat-nasso",
"parashat-behaalotcha",
"parashat-shlach",
"parashat-korach",
"parashat-chukat",
"parashat-balak",
"parashat-pinchas",
"parashat-matot",
"parashat-masei",
},
[TorahBook.Devarim] = new NullSafeList<string>
{
"parashat-devarim",
"parashat-vaetchanan",
"parashat-eikev",
"parashat-reeh",
"parashat-shoftim",
"parashat-ki-teitzei",
"parashat-ki-tavo",
"parashat-nitzavim",
"parashat-vayeilech",
"parashat-haazinu",
"parashat-vezot-haberakhah",
}
};

}

}
100 changes: 100 additions & 0 deletions Project/Source/Common/Hebrew/Entities/OnlineParashot.TheYeshivaNet.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/// <license>
/// This file is part of Ordisoftware Hebrew Calendar/Letters/Words.
/// Copyright 2012-2021 Olivier Rogier.
/// See www.ordisoftware.com for more information.
/// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
/// If a copy of the MPL was not distributed with this file, You can obtain one at
/// https://mozilla.org/MPL/2.0/.
/// If it is not possible or desirable to put the notice in a particular file,
/// then You may include the notice in a location(such as a LICENSE file in a
/// relevant directory) where a recipient would be likely to look for such a notice.
/// You may add additional accurate notices of copyright ownership.
/// </license>
/// <created> 2021-09 </created>
/// <edited> 2021-09 </edited>
using System;
using Ordisoftware.Core;

namespace Ordisoftware.Hebrew
{

static partial class OnlineParashot
{

static public readonly NullSafeDictionary<TorahBook, NullSafeList<string>> TheYeshivaNet
= new NullSafeDictionary<TorahBook, NullSafeList<string>>
{
[TorahBook.Bereshit] = new NullSafeList<string>
{
"c7/torah/parsha/bereshit/bereshit",
"c8/torah/parsha/bereshit/noach",
"c9/torah/parsha/bereshit/lech-lecha",
"c10/torah/parsha/bereshit/vayera",
"c11/torah/parsha/bereshit/chayei-sarah",
"c13/torah/parsha/bereshit/toldot",
"c16/torah/parsha/bereshit/vayetzei",
"c18/torah/parsha/bereshit/vayishlach",
"c15/torah/parsha/bereshit/vayeshev",
"c12/torah/parsha/bereshit/miketz",
"c17/torah/parsha/bereshit/vayigash",
"c14/torah/parsha/bereshit/vayechi",
},
[TorahBook.Shemot] = new NullSafeList<string>
{
"c25/torah/parsha/shemot/shemot",
"c28/torah/parsha/shemot/vaera",
"c21/torah/parsha/shemot/bo",
"c20/torah/parsha/shemot/beshalach",
"c30/torah/parsha/shemot/yisro",
"c23/torah/parsha/shemot/mishpatim",
"c26/torah/parsha/shemot/terumah",
"c27/torah/parsha/shemot/tetzaveh",
"c22/torah/parsha/shemot/ki-tisa",
"c29/torah/parsha/shemot/vayakhel",
"c24/torah/parsha/shemot/pekudei",
},
[TorahBook.Vayiqra] = new NullSafeList<string>
{
"c41/torah/parsha/vayikra/vayikra",
"c40/torah/parsha/vayikra/tzav",
"c38/torah/parsha/vayikra/shmini",
"c39/torah/parsha/vayikra/tazria",
"c37/torah/parsha/vayikra/metzora",
"c32/torah/parsha/vayikra/acharei-mos",
"c36/torah/parsha/vayikra/kedoshim",
"c35/torah/parsha/vayikra/emor",
"c34/torah/parsha/vayikra/behar",
"c33/torah/parsha/vayikra/bechukotai",
},
[TorahBook.Bamidbar] = new NullSafeList<string>
{
"c44/torah/parsha/bamidbar/bamidbar",
"c50/torah/parsha/bamidbar/nasso",
"c45/torah/parsha/bamidbar/behaalotcha",
"c52/torah/parsha/bamidbar/shlach",
"c47/torah/parsha/bamidbar/korach",
"c46/torah/parsha/bamidbar/chukat",
"c43/torah/parsha/bamidbar/balak",
"c51/torah/parsha/bamidbar/pinchas",
"c49/torah/parsha/bamidbar/matot",
"c48/torah/parsha/bamidbar/maasei",
},
[TorahBook.Devarim] = new NullSafeList<string>
{
"c55/torah/parsha/devarim/devarim",
"c63/torah/parsha/devarim/vaetchanan",
"c56/torah/parsha/devarim/eikev",
"c61/torah/parsha/devarim/reeh",
"c62/torah/parsha/devarim/shoftim",
"c59/torah/parsha/devarim/ki-teitzei",
"c58/torah/parsha/devarim/ki-tavo",
"c60/torah/parsha/devarim/nitzavim",
"c64/torah/parsha/devarim/vayeilech",
"c57/torah/parsha/devarim/haazinu",
"c65/torah/parsha/devarim/vezot-haberakhah",
}
};

}

}
Loading

0 comments on commit 181b88b

Please sign in to comment.