Skip to content

Commit

Permalink
Merge pull request #61 from wmo-raf/develop
Browse files Browse the repository at this point in the history
Updates and Bug Fixes
  • Loading branch information
erick-otenyo authored Jan 16, 2024
2 parents 1978d19 + 25025e3 commit 30e2d0c
Show file tree
Hide file tree
Showing 291 changed files with 3,699 additions and 3,089 deletions.
6 changes: 3 additions & 3 deletions base/blocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class Meta:

class TitleTextImageBlock(blocks.StructBlock):
title = blocks.CharBlock(max_length=100, verbose_name=_('Section Title'),
help_text=_("Section title"), )
help_text=_("Section Title"), )
text = blocks.RichTextBlock(features=SUMMARY_RICHTEXT_FEATURES, verbose_name=_('Section Text'),
help_text=_("Section description"))
image = ImageChooserBlock(required=False)
Expand All @@ -57,7 +57,7 @@ class Meta:

class TitleTextBlock(blocks.StructBlock):
title = blocks.CharBlock(max_length=100, verbose_name=_('Section Title'),
help_text=_("Section title"), )
help_text=_("Section Title"), )
text = blocks.RichTextBlock(features=SUMMARY_RICHTEXT_FEATURES, verbose_name=_('Section Text'),
help_text=_("Section description"))

Expand Down Expand Up @@ -214,7 +214,7 @@ class NavigationItemBlock(blocks.StructBlock):
large_submenu = blocks.BooleanBlock(required=False, label=_("Large Submenu Dropdown"))
sub_items = blocks.StreamBlock([
('sub_item', NavigationSubItemBlock())
], required=False)
], required=False)

class Meta:
template = "blocks/main_menu.html"
Expand Down
Binary file modified base/locale/am/LC_MESSAGES/django.mo
Binary file not shown.
14 changes: 5 additions & 9 deletions base/locale/am/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-10-09 09:55+0300\n"
"POT-Creation-Date: 2024-01-11 14:37+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -17,14 +17,10 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#: base/blocks.py:46 base/blocks.py:59
#: base/blocks.py:46 base/blocks.py:47 base/blocks.py:59 base/blocks.py:60
msgid "Section Title"
msgstr "ክፍል ርዕስ"

#: base/blocks.py:47 base/blocks.py:60
msgid "Section title"
msgstr "ክፍል ርዕስ"

#: base/blocks.py:48 base/blocks.py:61
msgid "Section Text"
msgstr "ክፍል ጽሑፍ"
Expand Down Expand Up @@ -204,7 +200,7 @@ msgstr "የመግቢያ አዝራር ጽሑፍ"
msgid "Introduction button link"
msgstr "የመግቢያ አዝራር አገናኝ"

#: base/models/abstracts.py:100
#: base/models/abstracts.py:104
msgid "Introduction Section"
msgstr "የመግቢያ ክፍል"

Expand Down Expand Up @@ -315,7 +311,7 @@ msgstr "GA የመከታተያ መታወቂያ"

#: base/models/site_settings.py:152
msgid "Your Google Analytics tracking ID (begins with \"UA-\")"
msgstr "የእርስዎ Google Analytics መከታተያ መታወቂያ (በ\"UA- ይጀምራል\")"
msgstr "የጉግል አናሌቲክስ መከታተያ መታወቂያዎ (በ\"UA- ይጀምራል\")"

#: base/models/site_settings.py:156
msgid "Track button clicks"
Expand All @@ -327,7 +323,7 @@ msgid ""
"tracking details can be specified in each button’s advanced settings "
"options."
msgstr ""
"ጉግል አናሌቲክስ የክስተት ክትትልን በመጠቀም ሁሉንም የአዝራር ጠቅታዎች ይከታተሉ፣ የክስተት ክትትል ዝርዝሮች "
"ጉግል አናሌቲክስ የክስተት ክትትልን በመጠቀም ሁሉንም የአዝራር ጠቅታዎች ይከታተሉ፣ የክስተት መከታተያ ዝርዝሮች "
"በእያንዳንዱ አዝራር የላቀ የቅንጅቶች አማራጮች ውስጥ ሊገለጹ ይችላሉ።"

#: base/models/site_settings.py:163
Expand Down
Binary file modified base/locale/ar/LC_MESSAGES/django.mo
Binary file not shown.
39 changes: 4 additions & 35 deletions base/locale/ar/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-10-06 12:09+0300\n"
"POT-Creation-Date: 2024-01-11 15:01+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -18,21 +18,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"

#: base/blocks.py:46 base/blocks.py:59
#: base/blocks.py:46 base/blocks.py:47 base/blocks.py:59 base/blocks.py:60
msgid "Section Title"
msgstr "عنوان القسم"

#: base/blocks.py:47 base/blocks.py:60
msgid "Section title"
msgstr "عنوان القسم"

#: base/blocks.py:48 base/blocks.py:61
msgid "Section Text"
msgstr "نص القسم"

#: base/blocks.py:49 base/blocks.py:62
#, fuzzy
#| msgid "Description"
msgid "Section description"
msgstr "وصف القسم"

Expand Down Expand Up @@ -209,7 +203,7 @@ msgstr "نص زر المقدمة"
msgid "Introduction button link"
msgstr "رابط زر المقدمة"

#: base/models/abstracts.py:100
#: base/models/abstracts.py:104
msgid "Introduction Section"
msgstr "قسم المقدمة"

Expand Down Expand Up @@ -369,8 +363,6 @@ msgid "languages"
msgstr "اللغات"

#: base/models/site_settings.py:206
#, fuzzy
#| msgid "Default Language"
msgid "Google Translate Languages"
msgstr "جوجل ترجمة اللغات"

Expand Down Expand Up @@ -431,14 +423,10 @@ msgid "Theme"
msgstr "سمة"

#: base/models/site_settings.py:284
#, fuzzy
#| msgid "Organisation Settings"
msgid "Navigation Setting"
msgstr "إعداد الملاحة"

#: base/models/site_settings.py:285
#, fuzzy
#| msgid "Organisation Settings"
msgid "Navigation Settings"
msgstr "إعدادات التنقل"

Expand Down Expand Up @@ -491,8 +479,6 @@ msgid "All vacancies page"
msgstr "صفحة جميع الوظائف الشاغرة"

#: base/models/site_settings.py:328
#, fuzzy
#| msgid "All feedback page"
msgid "Feedback page"
msgstr "صفحة ردود الفعل"

Expand All @@ -505,14 +491,10 @@ msgid "Important Pages"
msgstr "صفحات مهمة"

#: base/models/snippets.py:18
#, fuzzy
#| msgid "Product Category"
msgid "Product Name"
msgstr "اسم المنتج"

#: base/models/snippets.py:22 base/models/snippets.py:58
#, fuzzy
#| msgid "Products Categories"
msgid "Product Categories"
msgstr "فئات المنتجات"

Expand All @@ -521,8 +503,6 @@ msgid "Product Category"
msgstr "فئة المنتج"

#: base/models/snippets.py:26 base/models/snippets.py:46
#, fuzzy
#| msgid "Product Category"
msgid "Product"
msgstr "منتج"

Expand All @@ -536,14 +516,10 @@ msgid "Name"
msgstr "اسم"

#: base/models/snippets.py:54
#, fuzzy
#| msgid "Products Categories"
msgid "Product Item Types"
msgstr "أنواع عناصر المنتج"

#: base/models/snippets.py:54
#, fuzzy
#| msgid "Product Category"
msgid "Product Item Type"
msgstr "نوع السلعة المنتج"

Expand Down Expand Up @@ -584,14 +560,10 @@ msgid "GIS Applications"
msgstr "تطبيقات نظم المعلومات الجغرافية"

#: base/templates/admin/cms_upgrade_notification.html:5
#, fuzzy
#| msgid "CMS upgrade available"
msgid "CMS upgrade available. Your version:"
msgstr "ترقية CMS متاحة. الإصدار الخاص بك:"

#: base/templates/admin/cms_upgrade_notification.html:6
#, fuzzy
#| msgid "Latest available version"
msgid "Latest version:"
msgstr "احدث اصدار:"

Expand All @@ -600,10 +572,7 @@ msgid "Upgrade"
msgstr "يرقي"

#: base/templates/admin/cms_version.html:6
#, fuzzy, python-format
#| msgid ""
#| "\n"
#| " %(title)s\n"
#, python-format
msgid "%(title)s"
msgstr "%(title)s"

Expand Down
Binary file modified base/locale/en/LC_MESSAGES/django.mo
Binary file not shown.
Loading

0 comments on commit 30e2d0c

Please sign in to comment.