Skip to content

Commit

Permalink
fix typos and version update for cocoapods
Browse files Browse the repository at this point in the history
  • Loading branch information
Elyahu41 committed Jan 14, 2024
1 parent d206dfd commit 81326d3
Show file tree
Hide file tree
Showing 16 changed files with 162 additions and 164 deletions.
2 changes: 1 addition & 1 deletion KosherSwiftNew.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |spec|

spec.name = "KosherSwiftNew"
spec.version = "1.0.2"
spec.version = "1.0.4"
spec.summary = "KosherJava Zmanim API / Library ported to Swift."

spec.description = "This Zmanim library is an API for a specialized calendar that can calculate different astronomical times including sunrise and sunset and Jewish zmanim or religious times for prayers and other Jewish religious duties.
Expand Down
14 changes: 7 additions & 7 deletions Sources/KosherSwift/AstronomicalCalendar.swift
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public class AstronomicalCalendar {
public var astronomicalCalculator:AstronomicalCalculator;

/**
* The getSunrise method Returns a <code>Date</code> representing the
* The getSunrise method returns a <code>Date</code> representing the
* ``AstronomicalCalculator.getElevationAdjustment(double)`` elevation adjusted sunrise time. The zenith used
* for the calculation uses ``GEOMETRIC_ZENITH`` geometric zenith of 90&deg; plus
* ``AstronomicalCalculator.getElevationAdjustment(double)``. This is adjusted by the
Expand Down Expand Up @@ -315,8 +315,8 @@ public class AstronomicalCalendar {
}

/**
* Default constructor will set a default ``GeoLocation``, a default
* ``AstronomicalCalculator.getDefault()`` AstronomicalCalculator and default the calendar to the current date.
* The default constructor will set a default ``GeoLocation``, a default
* ``AstronomicalCalculator`` which will be the more accurate ``NOAACalculator``, and default the workingDate to the current date.
*/
public init() {
self.workingDate = Date()
Expand All @@ -326,8 +326,8 @@ public class AstronomicalCalendar {

/**
* A constructor that takes in <a href="https://en.wikipedia.org/wiki/Geolocation">geolocation</a> information as a
* parameter. The default ``AstronomicalCalculator.getDefault()`` AstronomicalCalculator used for solar
* calculations is the the ``NOAACalculator``.
* parameter. The default ``AstronomicalCalculator`` used for solar
* calculations is the the more accurate ``NOAACalculator``.
*
* @param geoLocation
* The location information used for calculating astronomical sun times.
Expand Down Expand Up @@ -533,7 +533,7 @@ public class AstronomicalCalendar {
* The time to be set as the time for the <code>Date</code>. The time expected is in the format: 18.75
* for 6:45:00 PM
* @param isSunrise true if the time is for sunrise
* @return The Date object from the time input
* @return The nullable Date? object representation of the time double
*/
func getDateFromTime(date:Date, time: Double, isSunrise:Bool) -> Date? {
if (time.isNaN) {
Expand Down Expand Up @@ -744,7 +744,7 @@ public class AstronomicalCalendar {
* with a number of different implementations of the <code>abstract</code> ``AstronomicalCalculator`` based on
* different algorithms, including the default ``NOAACalculator`` based on <a href=
* "https://noaa.gov">NOAA's</a> implementation of Jean Meeus's algorithms as well as ``SunTimesCalculator`` based on the <a href = "https://www.cnmoc.usff.navy.mil/usno/">US
* Naval Observatory's</a> algorithm,. This allows easy runtime switching and comparison of different algorithms.
* Naval Observatory's</a> algorithm. This allows easy runtime switching and comparison of different algorithms.
*
* @param astronomicalCalculator
* The astronomicalCalculator to set.
Expand Down
76 changes: 38 additions & 38 deletions Sources/KosherSwift/ComplexZmanimCalendar.swift

Large diffs are not rendered by default.

71 changes: 35 additions & 36 deletions Sources/KosherSwift/ZmanimCalendar.swift

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Sources/KosherSwift/hebrewcalendar/Daf.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import Foundation
*/
public class Daf {
/**
* ``getMasechtaNumber()`` and ``setMasechtaNumber(masechtaNumber:).
* See ``getMasechtaNumber()`` and ``setMasechtaNumber(masechtaNumber:).
*/
public var masechtaNumber:Int = 0

Expand Down Expand Up @@ -166,7 +166,7 @@ public class Daf {
}

/**
* Setter method to allow overriding of the default list of <em>masechtos</em> transliterated into into Latin chars.
* Setter method to allow overriding of the default list of <em>masechtos</em> transliterated into Latin chars.
* The default values use Ashkenazi American English transliteration.
*
* @param masechtosBavliTransliterated the list of transliterated Bavli <em>masechtos</em> to set.
Expand Down Expand Up @@ -217,7 +217,7 @@ public class Daf {
}

/**
* Setter method to allow overriding of the default list of Yerushalmi <em>masechtos</em> transliterated into into Latin chars.
* Setter method to allow overriding of the default list of Yerushalmi <em>masechtos</em> transliterated into Latin chars.
* The default uses Ashkenazi American English transliteration.
*
* @param masechtosYerushalmiTransliterated the list of transliterated Yerushalmi <em>masechtos</em> to set.
Expand All @@ -227,7 +227,7 @@ public class Daf {
}

/**
* Getter method to allow retrieving the list of Yerushalmi <em>masechtos</em> transliterated into into Latin chars.
* Getter method to allow retrieving the list of Yerushalmi <em>masechtos</em> transliterated into Latin chars.
* The default uses Ashkenazi American English transliteration.
*
* @return the array of transliterated <em>masechta</em> (tractate) names of the Daf Yomi Yerushalmi.
Expand Down
34 changes: 17 additions & 17 deletions Sources/KosherSwift/hebrewcalendar/HebrewDateFormatter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ public class HebrewDateFormatter {
* @see #getTransliteratedShabbosDayOfWeek()
* @see #setTransliteratedShabbosDayOfWeek(String)
*/
public var transliteratedShabbosDayOfweek = "Shabbos";
public var transliteratedShabbosDayOfWeek = "Shabbos";

/**
* Returns the day of Shabbos transliterated into Latin chars. The default uses Ashkenazi pronunciation "Shabbos".
Expand All @@ -337,7 +337,7 @@ public class HebrewDateFormatter {
* @see #formatDayOfWeek(JewishCalendar)
*/
public func getTransliteratedShabbosDayOfWeek() -> String {
return transliteratedShabbosDayOfweek;
return transliteratedShabbosDayOfWeek;
}

/**
Expand All @@ -351,7 +351,7 @@ public class HebrewDateFormatter {
* @see #formatDayOfWeek(JewishCalendar)
*/
public func setTransliteratedShabbosDayOfWeek(transliteratedShabbos:String) {
self.transliteratedShabbosDayOfweek = transliteratedShabbos;
self.transliteratedShabbosDayOfWeek = transliteratedShabbos;
}

/**
Expand Down Expand Up @@ -555,7 +555,7 @@ public class HebrewDateFormatter {
* pronunciation in typical American English spelling. This list has a length of 14 with 3 variations for Adar -
* "Adar", "Adar II", "Adar I"
*
* @return the list of months beginning in Nissan and ending in in "Adar", "Adar II", "Adar I". The default list is
* @return the list of months beginning in Nissan and ending in "Adar", "Adar II", "Adar I". The default list is
* currently ["Nissan", "Iyar", "Sivan", "Tammuz", "Av", "Elul", "Tishrei", "Cheshvan", "Kislev", "Teves",
* "Shevat", "Adar", "Adar II", "Adar I"].
* @see #setTransliteratedMonthList(String[])
Expand All @@ -565,7 +565,7 @@ public class HebrewDateFormatter {
}

/**
* Setter method to allow overriding of the default list of months transliterated into into Latin chars. The default
* Setter method to allow overriding of the default list of months transliterated into Latin chars. The default
* uses Ashkenazi American English transliteration.
*
* @param transliteratedMonths
Expand Down Expand Up @@ -679,15 +679,15 @@ public class HebrewDateFormatter {
* &#x05E9;&#x05D1;&#x05D8; &#x05D5;&#x05F3; &#x05D0;&#x05DC;&#x05E4;&#x05D9;&#x05DD; show the use of the Geresh.
*
* @param useGershGershayim
* set to false to omit the Geresh &#x5F3; and Gershayim &#x5F4; in formatting
* set this to false to omit the Geresh &#x5F3; and Gershayim &#x5F4; in formatting
*/
public func setUseGershGershayim(useGershGershayim:Bool) {
self.useGershGershayim = useGershGershayim;
}

/**
* Returns whether the class is set to use the &#x05DE;&#x05E0;&#x05E6;&#x05E4;&#x05F4;&#x05DA; letters when
* formatting years ending in 20, 40, 50, 80 and 90 to produce &#x05EA;&#x05E9;&#x05F4;&#x05E4; if false or
* formatting years ending in 20, 40, 50, 80 and 90 to produce &#x05EA;&#x05E9;&#x05F4;&#x05E4; if false
* or &#x05EA;&#x05E9;&#x05F4;&#x05E3; if true. Traditionally non-final form letters are used, so the year
* 5780 would be formatted as &#x05EA;&#x05E9;&#x05F4;&#x05E4; if the default false is used here. If this returns
* true, the format &#x05EA;&#x05E9;&#x05F4;&#x05E3; would be used.
Expand Down Expand Up @@ -863,17 +863,17 @@ public class HebrewDateFormatter {
public func getFormattedKviah(jewishYear:Int) -> String{
let jewishCalendar = JewishCalendar(jewishYear: jewishYear, jewishMonth: JewishCalendar.TISHREI, jewishDayOfMonth: 1); // set date to Rosh Hashana
let kviah = jewishCalendar.getCheshvanKislevKviah();
let roshHashanaDayOfweek = jewishCalendar.getDayOfWeek();
var returnValue = formatHebrewNumber(number: roshHashanaDayOfweek);
let roshHashanaDayOfWeek = jewishCalendar.getDayOfWeek();
var returnValue = formatHebrewNumber(number: roshHashanaDayOfWeek);
returnValue += (kviah == JewishCalendar.CHASERIM ? "\u{05D7}" : kviah == JewishCalendar.SHELAIMIM ? "\u{05E9}" : "\u{05DB}");
jewishCalendar.setJewishDate(year: jewishYear, month: JewishCalendar.NISSAN, dayOfMonth: 15); // set to Pesach of the given year
let pesachDayOfweek = jewishCalendar.getDayOfWeek();
returnValue += formatHebrewNumber(number: pesachDayOfweek);
let pesachDayOfWeek = jewishCalendar.getDayOfWeek();
returnValue += formatHebrewNumber(number: pesachDayOfWeek);
returnValue = returnValue.replacingOccurrences(of: HebrewDateFormatter.GERESH, with: "");// geresh is never used in the kviah format
// boolean isLeapYear = JewishCalendar.isJewishLeapYear(jewishYear);
// for efficiency we can avoid the expensive recalculation of the pesach day of week by adding 1 day to Rosh
// Hashana for a 353 day year, 2 for a 354 day year, 3 for a 355 or 383 day year, 4 for a 384 day year and 5 for
// a 385 day year
// Hashana for a 353-day year, 2 for a 354-day year, 3 for a 355 or 383-day year, 4 for a 384-day year and 5 for
// a 385-day year
return returnValue;
}

Expand Down Expand Up @@ -916,7 +916,7 @@ public class HebrewDateFormatter {
}

/**
* Returns a Hebrew formatted string of a number. The method can calculate from 0 - 9999.
* Returns a Hebrew formatted string of a number. The method can calculate from 0 to 9999.
* <ul>
* <li>Single digit numbers such as 3, 30 and 100 will be returned with a &#x5F3; (<a
* href="http://en.wikipedia.org/wiki/Geresh">Geresh</a>) appended as at the end. For example &#x5D2;&#x5F3;,
Expand Down Expand Up @@ -970,7 +970,7 @@ public class HebrewDateFormatter {
sb.append(HebrewDateFormatter.GERESH);
}
sb.append(" ");
sb.append(ALAFIM); // add # of thousands plus word thousand (overide alafim boolean)
sb.append(ALAFIM); // add # of thousands plus the word "thousand" (override alafim boolean)
return sb;
} else if (useLonghebrewYears && number >= 1000) { // if alafim boolean display thousands
sb.append(jOnes[thousands]);
Expand All @@ -989,7 +989,7 @@ public class HebrewDateFormatter {
sb.append(tavTaz[1]);
} else {
let tens = number / 10;
if (number % 10 == 0) { // if evenly divisable by 10
if (number % 10 == 0) { // if evenly divisible by 10
if (!singleDigitNumber) {
if(isUseFinalFormLetters()) {
sb.append(jTenEnds[tens]); // years like 5780 will end with a final form &#x05E3;
Expand Down Expand Up @@ -1026,7 +1026,7 @@ public class HebrewDateFormatter {
}

/**
* Setter method to allow overriding of the default list of parshiyos transliterated into into Latin chars. The
* Setter method to allow overriding of the default list of parshiyos transliterated into Latin chars. The
* default uses Ashkenazi American English transliteration.
*
* @param transliteratedParshaMap
Expand Down
Loading

0 comments on commit 81326d3

Please sign in to comment.