-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #18 from hotosm/feat/issue-12/language-switcher
Feat/issue 12/language switcher - Responsive Language Switcher with Custom SVG and Padding
- Loading branch information
Showing
23 changed files
with
162 additions
and
53 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,12 +3,11 @@ | |
| # This file is distributed under the same license as the PACKAGE package. | ||
| # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. | ||
| # | ||
| #, fuzzy | ||
| msgid "" | ||
| msgstr "" | ||
| "Project-Id-Version: PACKAGE VERSION\n" | ||
| "Report-Msgid-Bugs-To: \n" | ||
| "POT-Creation-Date: 2024-02-17 13:37+0000\n" | ||
| "POT-Creation-Date: 2024-03-14 08:59+0000\n" | ||
| "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | ||
| "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
| "Language-Team: LANGUAGE <[email protected]>\n" | ||
|
|
@@ -17,34 +16,43 @@ msgstr "" | |
| "Content-Type: text/plain; charset=UTF-8\n" | ||
| "Content-Transfer-Encoding: 8bit\n" | ||
| "Plural-Forms: nplurals=2; plural=(n != 1);\n" | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:6 | ||
|
|
||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:11 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:7 | ||
| msgid "Who We Are" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:7 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:12 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:8 | ||
| msgid "Our Work" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:8 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:13 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:9 | ||
| msgid "Our Mapping Hubs" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:9 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:14 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:10 | ||
| msgid "Tools & Resources" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:10 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:15 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:11 | ||
| msgid "Get Involved" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:11 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:16 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:12 | ||
| msgid "Start Mapping" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/secondary_desktop_nav.html:11 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:17 | ||
| #: hot_osm/templates/components/nav/secondary_desktop_nav.html:12 | ||
| msgid "News" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/secondary_desktop_nav.html:12 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:18 | ||
| #: hot_osm/templates/components/nav/secondary_desktop_nav.html:13 | ||
| msgid "Contact Us" | ||
| msgstr "" | ||
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,12 +3,11 @@ | |
| # This file is distributed under the same license as the PACKAGE package. | ||
| # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. | ||
| # | ||
| #, fuzzy | ||
| msgid "" | ||
| msgstr "" | ||
| "Project-Id-Version: PACKAGE VERSION\n" | ||
| "Report-Msgid-Bugs-To: \n" | ||
| "POT-Creation-Date: 2024-02-17 13:37+0000\n" | ||
| "POT-Creation-Date: 2024-03-14 08:59+0000\n" | ||
| "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | ||
| "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
| "Language-Team: LANGUAGE <[email protected]>\n" | ||
|
|
@@ -17,34 +16,43 @@ msgstr "" | |
| "Content-Type: text/plain; charset=UTF-8\n" | ||
| "Content-Transfer-Encoding: 8bit\n" | ||
| "Plural-Forms: nplurals=2; plural=(n != 1);\n" | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:6 | ||
| msgid "Who We Are" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:11 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:7 | ||
| msgid "Our Work" | ||
| msgstr "" | ||
| msgid "Who We Are" | ||
| msgstr "Quiénes somos" | ||
|
|
||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:12 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:8 | ||
| msgid "Our Work" | ||
| msgstr "Nuestro trabajo" | ||
|
|
||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:13 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:9 | ||
| msgid "Our Mapping Hubs" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:9 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:14 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:10 | ||
| msgid "Tools & Resources" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:10 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:15 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:11 | ||
| msgid "Get Involved" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:11 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:16 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:12 | ||
| msgid "Start Mapping" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/secondary_desktop_nav.html:11 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:17 | ||
| #: hot_osm/templates/components/nav/secondary_desktop_nav.html:12 | ||
| msgid "News" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/secondary_desktop_nav.html:12 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:18 | ||
| #: hot_osm/templates/components/nav/secondary_desktop_nav.html:13 | ||
| msgid "Contact Us" | ||
| msgstr "" | ||
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,12 +3,11 @@ | |
| # This file is distributed under the same license as the PACKAGE package. | ||
| # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. | ||
| # | ||
| #, fuzzy | ||
| msgid "" | ||
| msgstr "" | ||
| "Project-Id-Version: PACKAGE VERSION\n" | ||
| "Report-Msgid-Bugs-To: \n" | ||
| "POT-Creation-Date: 2024-02-17 13:37+0000\n" | ||
| "POT-Creation-Date: 2024-03-14 08:59+0000\n" | ||
| "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | ||
| "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||
| "Language-Team: LANGUAGE <[email protected]>\n" | ||
|
|
@@ -17,34 +16,43 @@ msgstr "" | |
| "Content-Type: text/plain; charset=UTF-8\n" | ||
| "Content-Transfer-Encoding: 8bit\n" | ||
| "Plural-Forms: nplurals=2; plural=(n > 1);\n" | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:6 | ||
| msgid "Who We Are" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:11 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:7 | ||
| msgid "Our Work" | ||
| msgstr "" | ||
| msgid "Who We Are" | ||
| msgstr "Qui nous sommes" | ||
|
|
||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:12 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:8 | ||
| msgid "Our Work" | ||
| msgstr "Nos travaux" | ||
|
|
||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:13 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:9 | ||
| msgid "Our Mapping Hubs" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:9 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:14 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:10 | ||
| msgid "Tools & Resources" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:10 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:15 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:11 | ||
| msgid "Get Involved" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:11 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:16 | ||
| #: hot_osm/templates/components/nav/primary_desktop_nav.html:12 | ||
| msgid "Start Mapping" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/secondary_desktop_nav.html:11 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:17 | ||
| #: hot_osm/templates/components/nav/secondary_desktop_nav.html:12 | ||
| msgid "News" | ||
| msgstr "" | ||
|
|
||
| #: hot_osm/templates/components/nav/secondary_desktop_nav.html:12 | ||
| #: hot_osm/templates/components/mobile/mobile_navigation.html:18 | ||
| #: hot_osm/templates/components/nav/secondary_desktop_nav.html:13 | ||
| msgid "Contact Us" | ||
| msgstr "" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 18 additions & 8 deletions
26
hot_osm/templates/components/mobile/mobile_navigation.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,33 @@ | ||
| {% load i18n %} | ||
| <div x-show="isMenuOpen" | ||
| @click.outside="isMenuOpen = false" | ||
| class="font-barlow lg:hidden" | ||
| id="mobile-menu"> | ||
| <nav class="gap-y-1 pb-3 pt-2 font-medium text-base-18" | ||
| aria-label="Global - Mobile"> | ||
| <ul class="list-none pl-0"> | ||
| <li>{% include "../mobile/mobile_menu_link.html" with link="#" text="Who We Are" selected=True parent=True %}</li> | ||
| <li>{% include "../mobile/mobile_menu_link.html" with link="#" text="Our Work" parent=True %}</li> | ||
| {% comment %} Strings for translation {% endcomment %} | ||
| {% translate "Who We Are" as who_we_are %} | ||
| {% translate "Our Work" as our_work %} | ||
| {% translate "Our Mapping Hubs" as our_mapping_hubs %} | ||
| {% translate "Tools & Resources" as tools_resources %} | ||
| {% translate "Get Involved" as get_involved %} | ||
| {% translate "Start Mapping" as start_mapping %} | ||
| {% translate "News" as news %} | ||
| {% translate "Contact Us" as contact_us %} | ||
| <li>{% include "../mobile/mobile_menu_link.html" with link="#" text=who_we_are selected=True parent=True %}</li> | ||
| <li>{% include "../mobile/mobile_menu_link.html" with link="#" text=our_work parent=True %}</li> | ||
| <li>{% include "../mobile/mobile_menu_link.html" with link="#" text="Open Mapping Hubs" parent=True %}</li> | ||
| <li>{% include "../mobile/mobile_menu_link.html" with link="#" text="Tools & Resources" parent=True %}</li> | ||
| <li>{% include "../mobile/mobile_menu_link.html" with link="#" text="Get Involved" parent=True %}</li> | ||
| <li>{% include "../branded_elements/button.html" with text="Start Mapping" classes="my-2 ml-3 mr-4" %}</li> | ||
| <li>{% include "../mobile/mobile_menu_link.html" with link="#" text=tools_resources parent=True %}</li> | ||
| <li>{% include "../mobile/mobile_menu_link.html" with link="#" text=get_involved parent=True %}</li> | ||
| <li>{% include "../branded_elements/button.html" with text=start_mapping classes="my-2 ml-3 mr-4" %}</li> | ||
| </ul> | ||
| </nav> | ||
| <nav class="border-t border-b border-hot-dark-grey py-2"> | ||
| <ul class="gap-y-0.5 list-none pl-0"> | ||
| <li>{% include "../mobile/mobile_menu_link.html" with link="#" text="EN" parent=True classes="px-4" %}</li> | ||
| <li>{% include "../mobile/mobile_menu_link.html" with link="#" text="News" classes="px-4" %}</li> | ||
| <li>{% include "../mobile/mobile_menu_link.html" with link="#" text="Contact Us" classes="px-4" %}</li> | ||
| <li>{% include "language_switcher.html" %}</li> | ||
| <li>{% include "../mobile/mobile_menu_link.html" with link="#" text=news %}</li> | ||
| <li>{% include "../mobile/mobile_menu_link.html" with link="#" text=contact_us %}</li> | ||
| </ul> | ||
| </nav> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| from django.contrib import admin | ||
|
|
||
| # Register your models here. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| from django.apps import AppConfig | ||
|
|
||
|
|
||
| class UtilsConfig(AppConfig): | ||
| default_auto_field = "django.db.models.BigAutoField" | ||
| name = "utils" |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| from django.db import models | ||
|
|
||
| # Create your models here. |
Oops, something went wrong.