Skip to content
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

Add hebrew document language #1027

Merged
merged 2 commits into from Aug 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions docker/dockerfiles/joex.dockerfile
Expand Up @@ -30,6 +30,7 @@ RUN JDKPKG="openjdk11"; \
tesseract-ocr-data-ron \
tesseract-ocr-data-lav \
tesseract-ocr-data-jpn \
tesseract-ocr-data-heb \
unpaper \
wkhtmltopdf \
libreoffice \
Expand Down
Expand Up @@ -102,6 +102,7 @@ object DateFind {
case Language.Dutch => dmy.or(ymd).or(mdy)
case Language.Latvian => dmy.or(lavLong).or(ymd)
case Language.Japanese => ymd
case Language.Hebrew => dmy
}
p.read(parts) match {
case Result.Success(sds, _) =>
Expand Down
Expand Up @@ -52,6 +52,8 @@ object MonthName {
latvian
case Language.Japanese =>
japanese
case Language.Hebrew =>
hebrew
}

private val numbers = List(
Expand Down Expand Up @@ -307,4 +309,19 @@ object MonthName {
List("11", "十一"),
List("12", "十二")
)

private val hebrew = List(
List("1", "ינואר"),
List("2", "פברואר"),
List("3", "מרץ"),
List("4", "אפריל"),
List("5", "מאי"),
List("6", "יוני"),
List("7", "יולי"),
List("8", "אוגוסט"),
List("9", "ספטמבר"),
List("10", "אוקטובר"),
List("11", "נובמבר"),
List("12", "דצמבר")
)
}
8 changes: 7 additions & 1 deletion modules/common/src/main/scala/docspell/common/Language.scala
Expand Up @@ -113,6 +113,11 @@ object Language {
val iso3 = "jpn"
}

case object Hebrew extends Language {
val iso2 = "he"
val iso3 = "heb"
}

val all: List[Language] =
List(
German,
Expand All @@ -130,7 +135,8 @@ object Language {
Russian,
Romanian,
Latvian,
Japanese
Japanese,
Hebrew
)

def fromString(str: String): Either[String, Language] = {
Expand Down
Expand Up @@ -114,7 +114,13 @@ object SolrSetup {
"Add japanese content field",
addContentField(Language.Japanese)
),
SolrMigration.reIndexAll(15, "Re-Index after adding japanese content field")
SolrMigration.reIndexAll(15, "Re-Index after adding japanese content field"),
SolrMigration[F](
16,
"Add hebrew content field",
addContentField(Language.Hebrew)
),
SolrMigration.reIndexAll(17, "Re-Index after adding hebrew content field")
)

def addFolderField: F[Unit] =
Expand Down
8 changes: 8 additions & 0 deletions modules/webapp/src/main/elm/Data/Language.elm
Expand Up @@ -30,6 +30,7 @@ type Language
| Dutch
| Latvian
| Japanese
| Hebrew


fromString : String -> Maybe Language
Expand Down Expand Up @@ -82,6 +83,9 @@ fromString str =
else if str == "jpn" || str == "ja" || str == "japanese" then
Just Japanese

else if str == "heb" || str == "he" || str == "hebrew" then
Just Hebrew

else
Nothing

Expand Down Expand Up @@ -137,6 +141,9 @@ toIso3 lang =
Japanese ->
"jpn"

Hebrew ->
"heb"


all : List Language
all =
Expand All @@ -156,4 +163,5 @@ all =
, Romanian
, Latvian
, Japanese
, Hebrew
]
6 changes: 6 additions & 0 deletions modules/webapp/src/main/elm/Messages/Data/Language.elm
Expand Up @@ -64,6 +64,9 @@ gb lang =
Japanese ->
"Japanese"

Hebrew ->
"Hebrew"


de : Language -> String
de lang =
Expand Down Expand Up @@ -115,3 +118,6 @@ de lang =

Japanese ->
"Japanisch"

Hebrew ->
"Hebräisch"