From 31ad04f5c07b297ade3f9c4f2b3814638d35f39d Mon Sep 17 00:00:00 2001
From: podlLev <pidlisnyilev@gmail.com>
Date: Tue, 28 Jul 2026 09:10:44 +0300
Subject: [PATCH 1/9] feat(config): configure MessageSource UTF-8 encoding and
 i18n setup

---
 .../weatherviewer/config/WebMvcConfig.java    | 30 +++++++++++++++++++
 src/main/resources/application.properties     |  5 ++++
 2 files changed, 35 insertions(+)
 create mode 100644 src/main/java/com/weatherviewer/config/WebMvcConfig.java

diff --git a/src/main/java/com/weatherviewer/config/WebMvcConfig.java b/src/main/java/com/weatherviewer/config/WebMvcConfig.java
new file mode 100644
index 0000000..7b9af5a
--- /dev/null
+++ b/src/main/java/com/weatherviewer/config/WebMvcConfig.java
@@ -0,0 +1,30 @@
+package com.weatherviewer.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
+
+/**
+ * Lets any request switch the active locale by adding a {@code lang} query
+ * parameter (e.g. {@code ?lang=uk}). The new locale is then persisted on
+ * the session by {@link AppConfig#localeResolver()}, so it applies to
+ * subsequent requests too, not just the one carrying the parameter.
+ */
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    @Bean
+    public LocaleChangeInterceptor localeChangeInterceptor() {
+        LocaleChangeInterceptor interceptor = new LocaleChangeInterceptor();
+        interceptor.setParamName("lang");
+        return interceptor;
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(localeChangeInterceptor());
+    }
+
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 6d8610d..37012af 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -17,6 +17,11 @@ spring.jpa.open-in-view=false
 spring.mvc.hiddenmethod.filter.enabled=true
 spring.jpa.properties.hibernate.jdbc.time_zone=UTC
 
+# --- Internationalization ---
+spring.messages.basename=messages
+spring.messages.encoding=UTF-8
+spring.messages.cache-duration=${MESSAGES_CACHE_SECONDS:0}
+
 server.servlet.session.cookie.secure=true
 server.servlet.session.cookie.same-site=strict
 

From 5f0a439c4b9d8c4fb4ec6fc656901087d2eea94a Mon Sep 17 00:00:00 2001
From: podlLev <pidlisnyilev@gmail.com>
Date: Tue, 28 Jul 2026 09:11:29 +0300
Subject: [PATCH 2/9] feat(i18n): add default and Ukrainian message properties
 bundles

---
 src/main/resources/messages.properties    | 116 ++++++++++++++++++++++
 src/main/resources/messages_uk.properties | 116 ++++++++++++++++++++++
 2 files changed, 232 insertions(+)
 create mode 100644 src/main/resources/messages.properties
 create mode 100644 src/main/resources/messages_uk.properties

diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
new file mode 100644
index 0000000..55dbdfe
--- /dev/null
+++ b/src/main/resources/messages.properties
@@ -0,0 +1,116 @@
+# Default (English) message bundle.
+
+# --- Header (header-component.html) ---
+header.sign-in=Sign in
+header.sign-up=Sign up
+header.sign-out=Sign out
+header.theme.dark-mode=Switch to dark mode
+header.language=Language
+
+# --- Sign-in page (sign-in.html) ---
+signin.title=Sign in
+signin.email.label=Email
+signin.email.placeholder=name@example.com
+signin.password.label=Password
+signin.password.placeholder=Password
+signin.remember-me=Remember me
+signin.forgot-password=Forgot password?
+signin.submit=Sign in
+signin.no-account=Don't have an account yet? -
+signin.sign-up-link=Sign up
+signin.resend.prompt=Didn't get a verification email?
+signin.resend.button=Resend verification email
+
+# --- Sign-up page (sign-up.html) ---
+signup.title=Sign up
+signup.first-name.label=First name
+signup.first-name.placeholder=John
+signup.last-name.label=Last name
+signup.last-name.placeholder=Doe
+signup.repeat-password.label=Repeat password
+signup.repeat-password.placeholder=Repeat password
+signup.submit=Sign up
+signup.have-account=Already have an account -
+signup.sign-in-link=Sign in
+
+# --- Shared auth links ---
+back-to-sign-in=Back to sign in
+
+# --- Forgot password page (forgot-password.html) ---
+forgot-password.title=Forgot password
+forgot-password.instructions=Enter the email address on your account and we'll send you a link to reset your password.
+forgot-password.submit=Send reset link
+
+# --- Reset password page (reset-password.html) ---
+reset-password.title=Reset password
+reset-password.password.label=New password
+reset-password.password.placeholder=New password
+reset-password.repeat-password.label=Repeat new password
+reset-password.repeat-password.placeholder=Repeat new password
+reset-password.submit=Set new password
+
+# --- Alert toasts (fragments/alerts.html) ---
+alerts.success-heading=Success
+alerts.error-heading=Error
+alerts.errors-heading=Errors
+alerts.close=Close
+
+# --- Error page (error.html) ---
+error.title=Oops! Something Went Wrong
+error.message=We're sorry, but an unexpected error has occurred. Please try again later.
+error.go-home=Go to Home
+
+# --- Footer (footer-component.html) ---
+footer.design-elements=Design elements
+footer.development=Development
+footer.copyright=Copyright \u00A9 2025 Pidlisnyi Lev
+
+# --- Search box (search-component.html) ---
+search.aria-label=Search for a location
+search.placeholder=Enter the location name
+search.submit=Search
+
+# --- Search results page (search.html) ---
+search.results-title=Search results
+search.no-data=No data
+search.add-location=Add to tracked locations
+
+# --- Forecast page (forecast.html) ---
+forecast.hourly-title=Hourly Forecast
+forecast.daily-title=Daily Forecast
+
+# --- Profile page (profile.html) ---
+profile.title=Account Settings
+profile.first-name.placeholder=First Name
+profile.last-name.placeholder=Last Name
+profile.password.placeholder=New Password
+profile.units.label=Units
+profile.units.metric=Metric (\u00B0C, m/s)
+profile.units.imperial=Imperial (\u00B0F, mph)
+profile.save=Save Changes
+
+# --- Home / dashboard page (home.html) ---
+home.current-weather=Current Weather
+home.sort-by=Sort by:
+home.sort.date=Date
+home.sort.name-asc=Name \u2191
+home.sort.name-desc=Name \u2193
+home.sort.favorite-first=Favorites First
+home.sort.favorites-only=Favorites Only
+home.delete=Delete
+home.add-favorite=Add to Favorites
+home.remove-favorite=Remove from Favorites
+home.feels-like=Feels like {0}{1}
+home.min=Min {0}{1}
+home.max=Max {0}{1}
+home.clouds=Clouds {0}%
+home.humidity=Humidity {0}%
+home.pressure=Pressure {0} hPa
+home.wind={0}\u00B0 {1} {2}
+home.sunrise=Sunrise {0}
+home.sunset=Sunset {0}
+home.forecast-button=Forecast
+home.no-location.title=Location Required for Weather Information
+home.no-location.instructions=Please add a location to view weather. You can do it by using the search bar above.
+home.pagination.previous=Previous
+home.pagination.next=Next
diff --git a/src/main/resources/messages_uk.properties b/src/main/resources/messages_uk.properties
new file mode 100644
index 0000000..4e8c31a
--- /dev/null
+++ b/src/main/resources/messages_uk.properties
@@ -0,0 +1,116 @@
+# Ukrainian translation. Keep keys in sync with messages.properties.
+
+# --- Header (header-component.html) ---
+header.sign-in=Увійти
+header.sign-up=Реєстрація
+header.sign-out=Вийти
+header.theme.dark-mode=Перемкнути на темну тему
+header.language=Мова
+
+# --- Sign-in page (sign-in.html) ---
+signin.title=Вхід
+signin.email.label=Електронна пошта
+signin.email.placeholder=name@example.com
+signin.password.label=Пароль
+signin.password.placeholder=Пароль
+signin.remember-me=Запам'ятати мене
+signin.forgot-password=Забули пароль?
+signin.submit=Увійти
+signin.no-account=Ще не маєте акаунта? -
+signin.sign-up-link=Зареєструватися
+signin.resend.prompt=Не отримали лист для підтвердження?
+signin.resend.button=Надіслати повторно
+
+# --- Sign-up page (sign-up.html) ---
+signup.title=Реєстрація
+signup.first-name.label=Ім'я
+signup.first-name.placeholder=Іван
+signup.last-name.label=Прізвище
+signup.last-name.placeholder=Петренко
+signup.repeat-password.label=Повторіть пароль
+signup.repeat-password.placeholder=Повторіть пароль
+signup.submit=Зареєструватися
+signup.have-account=Вже маєте акаунт -
+signup.sign-in-link=Увійти
+
+# --- Shared auth links ---
+back-to-sign-in=Повернутися до входу
+
+# --- Forgot password page (forgot-password.html) ---
+forgot-password.title=Забули пароль
+forgot-password.instructions=Введіть електронну адресу вашого акаунта, і ми надішлемо посилання для скидання пароля.
+forgot-password.submit=Надіслати посилання
+
+# --- Reset password page (reset-password.html) ---
+reset-password.title=Скидання пароля
+reset-password.password.label=Новий пароль
+reset-password.password.placeholder=Новий пароль
+reset-password.repeat-password.label=Повторіть новий пароль
+reset-password.repeat-password.placeholder=Повторіть новий пароль
+reset-password.submit=Встановити новий пароль
+
+# --- Alert toasts (fragments/alerts.html) ---
+alerts.success-heading=Успіх
+alerts.error-heading=Помилка
+alerts.errors-heading=Помилки
+alerts.close=Закрити
+
+# --- Error page (error.html) ---
+error.title=Ой! Щось пішло не так
+error.message=На жаль, сталася непередбачена помилка. Спробуйте пізніше.
+error.go-home=На головну
+
+# --- Footer (footer-component.html) ---
+footer.design-elements=Елементи дизайну
+footer.development=Розробка
+footer.copyright=Copyright \u00A9 2025 Pidlisnyi Lev
+
+# --- Search box (search-component.html) ---
+search.aria-label=Пошук місця
+search.placeholder=Введіть назву місця
+search.submit=Пошук
+
+# --- Search results page (search.html) ---
+search.results-title=Результати пошуку
+search.no-data=Немає даних
+search.add-location=Додати до відстежуваних місць
+
+# --- Forecast page (forecast.html) ---
+forecast.hourly-title=Погодинний прогноз
+forecast.daily-title=Щоденний прогноз
+
+# --- Profile page (profile.html) ---
+profile.title=Налаштування акаунта
+profile.first-name.placeholder=Ім'я
+profile.last-name.placeholder=Прізвище
+profile.password.placeholder=Новий пароль
+profile.units.label=Одиниці виміру
+profile.units.metric=Метричні (\u00B0C, м/с)
+profile.units.imperial=Імперські (\u00B0F, миль/год)
+profile.save=Зберегти зміни
+
+# --- Home / dashboard page (home.html) ---
+home.current-weather=Поточна погода
+home.sort-by=Сортувати за:
+home.sort.date=Датою
+home.sort.name-asc=Назвою \u2191
+home.sort.name-desc=Назвою \u2193
+home.sort.favorite-first=Спочатку обрані
+home.sort.favorites-only=Лише обрані
+home.delete=Видалити
+home.add-favorite=Додати до обраних
+home.remove-favorite=Прибрати з обраних
+home.feels-like=Відчувається як {0}{1}
+home.min=Мін. {0}{1}
+home.max=Макс. {0}{1}
+home.clouds=Хмарність {0}%
+home.humidity=Вологість {0}%
+home.pressure=Тиск {0} гПа
+home.wind={0}\u00B0 {1} {2}
+home.sunrise=Схід сонця {0}
+home.sunset=Захід сонця {0}
+home.forecast-button=Прогноз
+home.no-location.title=Потрібне місце для отримання погоди
+home.no-location.instructions=Додайте місце, щоб переглянути погоду. Це можна зробити за допомогою рядка пошуку вище.
+home.pagination.previous=Попередня
+home.pagination.next=Наступна
\ No newline at end of file

From cabe59543b23d6390e4a1284f1d79a5f5e53c690 Mon Sep 17 00:00:00 2001
From: podlLev <pidlisnyilev@gmail.com>
Date: Tue, 28 Jul 2026 09:12:15 +0300
Subject: [PATCH 3/9] refactor(templates): update HTML views to use localized
 i18n message keys

---
 src/main/resources/templates/error.html       |  6 +--
 .../resources/templates/footer-component.html |  6 +--
 src/main/resources/templates/forecast.html    |  4 +-
 .../resources/templates/forgot-password.html  | 13 ++---
 .../resources/templates/fragments/alerts.html | 12 ++---
 .../resources/templates/header-component.html | 20 ++++++--
 src/main/resources/templates/home.html        | 49 ++++++++++---------
 src/main/resources/templates/profile.html     | 26 +++++-----
 .../resources/templates/reset-password.html   | 16 +++---
 .../resources/templates/search-component.html |  6 +--
 src/main/resources/templates/search.html      |  6 +--
 src/main/resources/templates/sign-in.html     | 29 ++++++-----
 src/main/resources/templates/sign-up.html     | 34 ++++++++-----
 13 files changed, 127 insertions(+), 100 deletions(-)

diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html
index 85403df..a8a4d2d 100644
--- a/src/main/resources/templates/error.html
+++ b/src/main/resources/templates/error.html
@@ -7,9 +7,9 @@
 
 <th:block th:fragment="bodyContent">
     <div class="container text-center mt-5">
-        <h1 class="display-4">Oops! Something Went Wrong</h1>
-        <p class="lead">We're sorry, but an unexpected error has occurred. Please try again later.</p>
-        <a class="btn btn-primary" th:href="@{/}">Go to Home</a>
+        <h1 class="display-4" th:text="#{error.title}">Oops! Something Went Wrong</h1>
+        <p class="lead" th:text="#{error.message}">We're sorry, but an unexpected error has occurred. Please try again later.</p>
+        <a class="btn btn-primary" th:href="@{/}" th:text="#{error.go-home}">Go to Home</a>
     </div>
 </th:block>
 
diff --git a/src/main/resources/templates/footer-component.html b/src/main/resources/templates/footer-component.html
index d1294ad..77e6e56 100644
--- a/src/main/resources/templates/footer-component.html
+++ b/src/main/resources/templates/footer-component.html
@@ -2,10 +2,10 @@
     <div class="container text-white py-4 py-lg-5">
         <ul class="list-inline text-center">
             <li class="list-inline-item me-4"><a class="link-light"
-                                                 href="https://github.com/Makin-Things/platinum-weather-card">Design elements</a></li>
-            <li class="list-inline-item me-4"><a class="link-light" href="">Development</a>
+                                                 href="https://github.com/Makin-Things/platinum-weather-card" th:text="#{footer.design-elements}">Design elements</a></li>
+            <li class="list-inline-item me-4"><a class="link-light" href="" th:text="#{footer.development}">Development</a>
             </li>
         </ul>
-        <p class="text-secondary mb-0">Copyright © 2025 Pidlisnyi Lev</p>
+        <p class="text-secondary mb-0" th:text="#{footer.copyright}">Copyright © 2025 Pidlisnyi Lev</p>
     </div>
 </footer>
diff --git a/src/main/resources/templates/forecast.html b/src/main/resources/templates/forecast.html
index 7b291a4..f48f288 100644
--- a/src/main/resources/templates/forecast.html
+++ b/src/main/resources/templates/forecast.html
@@ -13,7 +13,7 @@
     <div class="container min-vh-100">
 
         <section class="mb-5">
-            <h2 class="mb-3">Hourly Forecast</h2>
+            <h2 class="mb-3" th:text="#{forecast.hourly-title}">Hourly Forecast</h2>
             <p class="text-muted mb-4" th:text="${locationName}"></p>
             <div class="row row-cols-1 row-cols-sm-3 row-cols-md-5 g-3">
                 <div class="col" th:each="forecast, iterStat : ${hourlyForecast}" th:if="${iterStat.index} < 5">
@@ -30,7 +30,7 @@ <h3 class="text-primary mb-2" th:text="${#numbers.formatDecimal(forecast.tempera
         </section>
 
         <section>
-            <h2 class="mb-3">Daily Forecast</h2>
+            <h2 class="mb-3" th:text="#{forecast.daily-title}">Daily Forecast</h2>
             <p class="text-muted mb-4" th:text="${locationName}"></p>
             <div class="row row-cols-1 row-cols-sm-3 row-cols-md-6 g-3">
                 <div class="col" th:each="forecast : ${dailyForecast}">
diff --git a/src/main/resources/templates/forgot-password.html b/src/main/resources/templates/forgot-password.html
index e325bdf..6c20372 100644
--- a/src/main/resources/templates/forgot-password.html
+++ b/src/main/resources/templates/forgot-password.html
@@ -14,19 +14,20 @@
         <div class="d-flex justify-content-center align-items-center vh-100">
             <div class="bg-image"></div>
             <div class="form mx-auto row p-4">
-                <h3 class="my-4 text-center">Forgot password</h3>
-                <p class="text-center text-muted mb-4">Enter the email address on your account and we'll send you a link to reset your password.</p>
+                <h3 class="my-4 text-center" th:text="#{forgot-password.title}">Forgot password</h3>
+                <p class="text-center text-muted mb-4" th:text="#{forgot-password.instructions}">Enter the email address on your account and we'll send you a link to reset your password.</p>
 
                 <form method="post" th:action="@{/forgot-password}" th:object="${forgotPasswordDto}">
                     <div class="form-floating mb-4">
-                        <input type="email" class="form-control" th:field="*{email}" id="email" placeholder="name@example.com" required>
-                        <label for="email">Email</label>
+                        <input type="email" class="form-control" th:field="*{email}" id="email"
+                               th:placeholder="#{signin.email.placeholder}" placeholder="name@example.com" required>
+                        <label for="email" th:text="#{signin.email.label}">Email</label>
                         <div th:if="${#fields.hasErrors('email')}" class="text-danger small mt-1" th:errors="*{email}"></div>
                     </div>
                     <div>
-                        <button class="btn btn-lg btn-primary mb-4 w-100" type="submit">Send reset link</button>
+                        <button class="btn btn-lg btn-primary mb-4 w-100" type="submit" th:text="#{forgot-password.submit}">Send reset link</button>
                         <div class="text-center">
-                            <p><a th:href="@{/sign-in}">Back to sign in</a></p>
+                            <p><a th:href="@{/sign-in}" th:text="#{back-to-sign-in}">Back to sign in</a></p>
                         </div>
                     </div>
                 </form>
diff --git a/src/main/resources/templates/fragments/alerts.html b/src/main/resources/templates/fragments/alerts.html
index 6ce79f8..95c64d7 100644
--- a/src/main/resources/templates/fragments/alerts.html
+++ b/src/main/resources/templates/fragments/alerts.html
@@ -4,8 +4,8 @@
              th:id="'successToast'"
              th:if="${successMessage != null}">
             <div class="toast-header bg-success text-white">
-                <strong class="me-auto">Success</strong>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="toast" aria-label="Close"></button>
+                <strong class="me-auto" th:text="#{alerts.success-heading}">Success</strong>
+                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="toast" th:aria-label="#{alerts.close}" aria-label="Close"></button>
             </div>
             <div class="toast-body" th:text="${successMessage}">Success message</div>
         </div>
@@ -14,8 +14,8 @@
              th:id="'errorToast'"
              th:if="${errorMessage != null}">
             <div class="toast-header bg-danger text-white">
-                <strong class="me-auto">Error</strong>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="toast" aria-label="Close"></button>
+                <strong class="me-auto" th:text="#{alerts.error-heading}">Error</strong>
+                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="toast" th:aria-label="#{alerts.close}" aria-label="Close"></button>
             </div>
             <div class="toast-body" th:text="${errorMessage}">Error message</div>
         </div>
@@ -24,8 +24,8 @@
              th:id="'errorsToast'"
              th:if="${errorMessages != null}">
             <div class="toast-header bg-danger text-white">
-                <strong class="me-auto">Errors</strong>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="toast" aria-label="Close"></button>
+                <strong class="me-auto" th:text="#{alerts.errors-heading}">Errors</strong>
+                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="toast" th:aria-label="#{alerts.close}" aria-label="Close"></button>
             </div>
             <div class="toast-body">
                 <ul>
diff --git a/src/main/resources/templates/header-component.html b/src/main/resources/templates/header-component.html
index b3dd6cf..635e0d3 100644
--- a/src/main/resources/templates/header-component.html
+++ b/src/main/resources/templates/header-component.html
@@ -11,13 +11,25 @@ <h4 class="m-0">Weather Viewer</h4>
                 <div th:replace="~{search-component}"></div>
             </div>
             <div class="col-auto d-flex align-items-center">
-                <button type="button" id="theme-toggle-btn" class="theme-toggle-btn" aria-label="Switch to dark mode" title="Switch to dark mode">
+                <div class="dropdown me-2">
+                    <button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" id="langDropdownBtn"
+                            data-bs-toggle="dropdown" aria-expanded="false" th:attr="aria-label=#{header.language}, title=#{header.language}">
+                        <span th:text="${#locale.language == 'uk'} ? 'UA' : 'EN'">EN</span>
+                    </button>
+                    <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="langDropdownBtn">
+                        <li><a class="dropdown-item" th:classappend="${#locale.language == 'en'} ? 'active'" th:href="@{''(lang='en')}">English</a></li>
+                        <li><a class="dropdown-item" th:classappend="${#locale.language == 'uk'} ? 'active'" th:href="@{''(lang='uk')}">Українська</a></li>
+                    </ul>
+                </div>
+                <button type="button" id="theme-toggle-btn" class="theme-toggle-btn"
+                        th:attr="aria-label=#{header.theme.dark-mode}, title=#{header.theme.dark-mode}"
+                        aria-label="Switch to dark mode" title="Switch to dark mode">
                     <i class="bi bi-moon-stars-fill"></i>
                 </button>
             </div>
             <div class="col d-flex justify-content-end" th:classappend="${login}? 'd-none'">
-                <a class="btn btn-outline-primary px-3" href="sign-in" role="button" th:href="@{/sign-in}">Sign in</a>
-                <a class="btn btn-primary px-3 ms-2" href="sign-up" role="button" th:href="@{/sign-up}">Sign up</a>
+                <a class="btn btn-outline-primary px-3" href="sign-in" role="button" th:href="@{/sign-in}" th:text="#{header.sign-in}">Sign in</a>
+                <a class="btn btn-primary px-3 ms-2" href="sign-up" role="button" th:href="@{/sign-up}" th:text="#{header.sign-up}">Sign up</a>
             </div>
             <div class="col d-flex justify-content-end align-items-center" th:classappend="!(${login})? 'd-none' : ''">
                 <a th:href="@{/profile}" class="text-body text-decoration-none fw-bold d-flex align-items-center">
@@ -25,7 +37,7 @@ <h4 class="m-0">Weather Viewer</h4>
                     <span th:text="${login}">Username</span>
                 </a>
                 <form method="post" th:action="@{/sign-out}">
-                    <button class="btn btn-outline-primary px-3 ms-4" type="submit">Sign out</button>
+                    <button class="btn btn-outline-primary px-3 ms-4" type="submit" th:text="#{header.sign-out}">Sign out</button>
                 </form>
             </div>
             <div th:replace="~{fragments/alerts :: alertToasts(${successMessage}, ${errorMessage}, ${errorMessages})}"></div>
diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html
index 63695ad..659e337 100644
--- a/src/main/resources/templates/home.html
+++ b/src/main/resources/templates/home.html
@@ -14,16 +14,16 @@
     <div class="container min-vh-100">
 
         <div class="d-flex justify-content-between align-items-center mb-3">
-            <h2 class="mb-0">Current Weather</h2>
+            <h2 class="mb-0" th:text="#{home.current-weather}">Current Weather</h2>
 
             <form method="get" th:action="@{/}" class="d-flex align-items-center">
-                <label for="sortSelect" class="me-2 fw-bold">Sort by:</label>
+                <label for="sortSelect" class="me-2 fw-bold" th:text="#{home.sort-by}">Sort by:</label>
                 <select id="sortSelect" name="sort" class="form-select form-select-sm w-auto">
-                    <option value="date" th:selected="${sort == 'date'}">Date</option>
-                    <option value="nameAsc" th:selected="${sort == 'nameAsc'}">Name ↑</option>
-                    <option value="nameDesc" th:selected="${sort == 'nameDesc'}">Name ↓</option>
-                    <option value="favoriteFirst" th:selected="${sort == 'favoriteFirst'}">Favorites First</option>
-                    <option value="favoritesOnly" th:selected="${sort == 'favoritesOnly'}">Favorites Only</option>
+                    <option value="date" th:selected="${sort == 'date'}" th:text="#{home.sort.date}">Date</option>
+                    <option value="nameAsc" th:selected="${sort == 'nameAsc'}" th:text="#{home.sort.name-asc}">Name ↑</option>
+                    <option value="nameDesc" th:selected="${sort == 'nameDesc'}" th:text="#{home.sort.name-desc}">Name ↓</option>
+                    <option value="favoriteFirst" th:selected="${sort == 'favoriteFirst'}" th:text="#{home.sort.favorite-first}">Favorites First</option>
+                    <option value="favoritesOnly" th:selected="${sort == 'favoritesOnly'}" th:text="#{home.sort.favorites-only}">Favorites Only</option>
                 </select>
             </form>
         </div>
@@ -75,19 +75,19 @@ <h4 class="card-title" th:text="${item.key.name}">Location</h4>
                                             <form th:action="@{/locations/{id}(id=${item.key.id})}" th:method="delete">
                                                 <input type="hidden" name="sort" th:value="${sort}">
                                                 <input type="hidden" name="page" th:value="${currentPage}">
-                                                <button class="dropdown-item" type="submit">Delete</button>
+                                                <button class="dropdown-item" type="submit" th:text="#{home.delete}">Delete</button>
                                             </form>
                                             <form th:action="@{/locations/{id}/favorite(id=${item.key.id})}"
                                                   th:method="post" th:if="${item.key.favorite == null or !item.key.favorite}">
                                                 <input type="hidden" name="sort" th:value="${sort}">
                                                 <input type="hidden" name="page" th:value="${currentPage}">
-                                                <button class="dropdown-item" type="submit">Add to Favorites</button>
+                                                <button class="dropdown-item" type="submit" th:text="#{home.add-favorite}">Add to Favorites</button>
                                             </form>
                                             <form th:action="@{/locations/{id}/favorite(id=${item.key.id})}"
                                                   th:method="delete" th:if="${item.key.favorite}">
                                                 <input type="hidden" name="sort" th:value="${sort}">
                                                 <input type="hidden" name="page" th:value="${currentPage}">
-                                                <button class="dropdown-item" type="submit">Remove from Favorites</button>
+                                                <button class="dropdown-item" type="submit" th:text="#{home.remove-favorite}">Remove from Favorites</button>
                                             </form>
                                         </div>
                                     </div>
@@ -103,7 +103,7 @@ <h4 class="card-title" th:text="${item.key.name}">Location</h4>
                                 </div>
                                 <div class="col-md-6 text-end align-self-center">
                                     <h1 class="text-primary" th:text="${item.value.temperature} + ${temperatureSymbol}"></h1>
-                                    <p th:text="'Feels like ' + ${item.value.temperatureFeelsLike} + ${temperatureSymbol}"></p>
+                                    <p th:text="#{home.feels-like(${item.value.temperatureFeelsLike}, ${temperatureSymbol})}"></p>
                                 </div>
                             </div>
                         </div>
@@ -117,15 +117,15 @@ <h1 class="text-primary" th:text="${item.value.temperature} + ${temperatureSymbo
                                     <ul class="list-group">
                                         <li class="list-group-item">
                                             <i class="fas fa-temperature-low" style="margin-right: 4px;width: 20px;"></i>
-                                            <span th:text="'Min ' + ${item.value.temperatureMinimum} + ${temperatureSymbol}"></span>
+                                            <span th:text="#{home.min(${item.value.temperatureMinimum}, ${temperatureSymbol})}"></span>
                                         </li>
                                         <li class="list-group-item">
                                             <i class="fas fa-cloud" style="margin-right: 4px;width: 20px;font-size: 14px;"></i>
-                                            <span th:text="'Clouds ' + ${item.value.cloudiness} + '%'"></span>
+                                            <span th:text="#{home.clouds(${item.value.cloudiness})}"></span>
                                         </li>
                                         <li class="list-group-item">
                                             <i class="fas fa-wind" style="margin-right: 5px;width: 20px;"></i>
-                                            <span th:text="|${item.value.windDirection}&deg; ${item.value.windSpeed} ${windSpeedUnit}|"></span>
+                                            <span th:text="#{home.wind(${item.value.windDirection}, ${item.value.windSpeed}, ${windSpeedUnit})}"></span>
                                         </li>
                                         <li class="list-group-item">
                                             <svg class="bi bi-sunrise" fill="currentColor" height="1em"
@@ -143,7 +143,7 @@ <h1 class="text-primary" th:text="${item.value.temperature} + ${temperatureSymbo
                                                  1h15a.5.5 0 0 0 0-1h-3.79z">
                                                 </path>
                                             </svg>
-                                            <span th:text="'Sunrise ' + ${#dates.format(item.value.sunrise, 'HH:mm:ss')}"></span>
+                                            <span th:text="#{home.sunrise(${#dates.format(item.value.sunrise, 'HH:mm:ss')})}"></span>
                                         </li>
                                     </ul>
                                 </div>
@@ -152,15 +152,15 @@ <h1 class="text-primary" th:text="${item.value.temperature} + ${temperatureSymbo
                                     <ul class="list-group">
                                         <li class="list-group-item">
                                             <i class="fas fa-temperature-high" style="margin-right: 0;width: 20px;"></i>
-                                            <span th:text="'Max ' + ${item.value.temperatureMaximum} + ${temperatureSymbol}"></span>
+                                            <span th:text="#{home.max(${item.value.temperatureMaximum}, ${temperatureSymbol})}"></span>
                                         </li>
                                         <li class="list-group-item">
                                             <i class="icon ion-waterdrop" style="margin-right: 10px;width: 20px;font-size: 16px;"></i>
-                                            <span th:text="'Humidity ' + ${item.value.humidity} + '%'"></span>
+                                            <span th:text="#{home.humidity(${item.value.humidity})}"></span>
                                         </li>
                                         <li class="list-group-item">
                                             <i class="fas fa-angle-double-down" style="margin-right: 0;width: 20px;"></i>
-                                            <span th:text="'Pressure ' + ${item.value.pressure} + ' hPa'"></span>
+                                            <span th:text="#{home.pressure(${item.value.pressure})}"></span>
                                         </li>
                                         <li class="list-group-item">
                                             <svg class="bi bi-sunset" fill="currentColor" height="1em"
@@ -180,7 +180,7 @@ <h1 class="text-primary" th:text="${item.value.temperature} + ${temperatureSymbo
                                                  0 0 0 0-1h-3.79z">
                                                 </path>
                                             </svg>
-                                            <span th:text="'Sunset ' + ${#dates.format(item.value.sunset, 'HH:mm:ss')}"></span>
+                                            <span th:text="#{home.sunset(${#dates.format(item.value.sunset, 'HH:mm:ss')})}"></span>
                                         </li>
                                     </ul>
                                 </div>
@@ -189,7 +189,8 @@ <h1 class="text-primary" th:text="${item.value.temperature} + ${temperatureSymbo
 
                         <div class="d-flex justify-content-center mt-3">
                             <a class="btn btn-primary btn-lg px-4" role="button"
-                               th:href="@{/forecast(lat=${item.key.latitude},lon=${item.key.longitude})}">
+                               th:href="@{/forecast(lat=${item.key.latitude},lon=${item.key.longitude})}"
+                               th:text="#{home.forecast-button}">
                                 Forecast
                             </a>
                         </div>
@@ -200,15 +201,15 @@ <h1 class="text-primary" th:text="${item.value.temperature} + ${temperatureSymbo
         <div class="container d-flex justify-content-between align-items-center flex-column"
              th:unless="${locationWeatherMap}">
             <img alt="missing data" th:src="@{/images/missing-data.svg}">
-            <p class="fw-bold">Location Required for Weather Information</p>
-            <p>Please add a location to view weather. You can do it by using the search bar above.</p>
+            <p class="fw-bold" th:text="#{home.no-location.title}">Location Required for Weather Information</p>
+            <p th:text="#{home.no-location.instructions}">Please add a location to view weather. You can do it by using the search bar above.</p>
         </div>
 
         <nav aria-label="Dashboard pagination" class="d-flex justify-content-center mt-4"
              th:if="${totalPages != null and totalPages > 1}">
             <ul class="pagination">
                 <li class="page-item" th:classappend="${!hasPreviousPage} ? 'disabled'">
-                    <a class="page-link" th:href="@{/(sort=${sort}, page=${currentPage - 1})}">Previous</a>
+                    <a class="page-link" th:href="@{/(sort=${sort}, page=${currentPage - 1})}" th:text="#{home.pagination.previous}">Previous</a>
                 </li>
                 <li class="page-item" th:each="pageNumber : ${#numbers.sequence(0, totalPages - 1)}"
                     th:classappend="${pageNumber == currentPage} ? 'active'">
@@ -216,7 +217,7 @@ <h1 class="text-primary" th:text="${item.value.temperature} + ${temperatureSymbo
                        th:text="${pageNumber + 1}">1</a>
                 </li>
                 <li class="page-item" th:classappend="${!hasNextPage} ? 'disabled'">
-                    <a class="page-link" th:href="@{/(sort=${sort}, page=${currentPage + 1})}">Next</a>
+                    <a class="page-link" th:href="@{/(sort=${sort}, page=${currentPage + 1})}" th:text="#{home.pagination.next}">Next</a>
                 </li>
             </ul>
         </nav>
diff --git a/src/main/resources/templates/profile.html b/src/main/resources/templates/profile.html
index 23edacd..5ee682e 100644
--- a/src/main/resources/templates/profile.html
+++ b/src/main/resources/templates/profile.html
@@ -17,42 +17,42 @@
             <div class="col-12 col-lg-7">
                 <form th:action="@{/profile}" th:object="${user}" method="post" class="col-12 col-lg-7">
                     <div class="card shadow-sm rounded p-4 mb-5">
-                        <h4 class="card-title mb-4">Account Settings</h4>
+                        <h4 class="card-title mb-4" th:text="#{profile.title}">Account Settings</h4>
 
                         <div class="form-floating mb-3">
-                            <input id="email" type="email" th:field="*{email}" class="form-control" placeholder="name@example.com" required>
-                            <label for="email"><i class="bi bi-envelope-fill me-1"></i>Email</label>
+                            <input id="email" type="email" th:field="*{email}" class="form-control" th:placeholder="#{signin.email.placeholder}" placeholder="name@example.com" required>
+                            <label for="email"><i class="bi bi-envelope-fill me-1"></i><span th:text="#{signin.email.label}">Email</span></label>
                             <div class="text-danger small mt-1" th:if="${#fields.hasErrors('email')}" th:errors="*{email}"></div>
                         </div>
 
                         <div class="form-floating mb-3">
-                            <input id="firstName" type="text" th:field="*{firstName}" class="form-control" placeholder="First Name" required>
-                            <label for="firstName"><i class="bi bi-person-fill me-1"></i>First Name</label>
+                            <input id="firstName" type="text" th:field="*{firstName}" class="form-control" th:placeholder="#{profile.first-name.placeholder}" placeholder="First Name" required>
+                            <label for="firstName"><i class="bi bi-person-fill me-1"></i><span th:text="#{signup.first-name.label}">First Name</span></label>
                             <div class="text-danger small mt-1" th:if="${#fields.hasErrors('firstName')}" th:errors="*{firstName}"></div>
                         </div>
 
                         <div class="form-floating mb-3">
-                            <input id="lastName" type="text" th:field="*{lastName}" class="form-control" placeholder="Last Name" required>
-                            <label for="lastName"><i class="bi bi-person-fill me-1"></i>Last Name</label>
+                            <input id="lastName" type="text" th:field="*{lastName}" class="form-control" th:placeholder="#{profile.last-name.placeholder}" placeholder="Last Name" required>
+                            <label for="lastName"><i class="bi bi-person-fill me-1"></i><span th:text="#{signup.last-name.label}">Last Name</span></label>
                             <div class="text-danger small mt-1" th:if="${#fields.hasErrors('lastName')}" th:errors="*{lastName}"></div>
                         </div>
 
                         <div class="form-floating mb-4">
-                            <input id="password" type="password" th:field="*{password}" class="form-control" placeholder="New Password">
-                            <label for="password"><i class="bi bi-lock-fill me-1"></i>Password</label>
+                            <input id="password" type="password" th:field="*{password}" class="form-control" th:placeholder="#{profile.password.placeholder}" placeholder="New Password">
+                            <label for="password"><i class="bi bi-lock-fill me-1"></i><span th:text="#{signin.password.label}">Password</span></label>
                             <div class="text-danger small mt-1" th:if="${#fields.hasErrors('password')}" th:errors="*{password}"></div>
                         </div>
 
                         <div class="form-floating mb-4">
                             <select id="units" th:field="*{units}" class="form-select">
-                                <option value="METRIC">Metric (°C, m/s)</option>
-                                <option value="IMPERIAL">Imperial (°F, mph)</option>
+                                <option value="METRIC" th:text="#{profile.units.metric}">Metric (°C, m/s)</option>
+                                <option value="IMPERIAL" th:text="#{profile.units.imperial}">Imperial (°F, mph)</option>
                             </select>
-                            <label for="units"><i class="bi bi-thermometer-half me-1"></i>Units</label>
+                            <label for="units"><i class="bi bi-thermometer-half me-1"></i><span th:text="#{profile.units.label}">Units</span></label>
                         </div>
 
                         <div class="d-grid">
-                            <button type="submit" class="btn btn-primary btn-lg fw-bold">Save Changes</button>
+                            <button type="submit" class="btn btn-primary btn-lg fw-bold" th:text="#{profile.save}">Save Changes</button>
                         </div>
                     </div>
                 </form>
diff --git a/src/main/resources/templates/reset-password.html b/src/main/resources/templates/reset-password.html
index 64aa10e..2967b2a 100644
--- a/src/main/resources/templates/reset-password.html
+++ b/src/main/resources/templates/reset-password.html
@@ -14,24 +14,26 @@
         <div class="d-flex justify-content-center align-items-center vh-100">
             <div class="bg-image"></div>
             <div class="form mx-auto row p-4">
-                <h3 class="my-4 text-center">Reset password</h3>
+                <h3 class="my-4 text-center" th:text="#{reset-password.title}">Reset password</h3>
 
                 <form method="post" th:action="@{/reset-password}" th:object="${resetPasswordDto}">
                     <input type="hidden" th:field="*{token}">
                     <div class="form-floating mb-4">
-                        <input type="password" class="form-control" th:field="*{password}" id="password" placeholder="New password" required>
-                        <label for="password">New password</label>
+                        <input type="password" class="form-control" th:field="*{password}" id="password"
+                               th:placeholder="#{reset-password.password.placeholder}" placeholder="New password" required>
+                        <label for="password" th:text="#{reset-password.password.label}">New password</label>
                         <div th:if="${#fields.hasErrors('password')}" class="text-danger small mt-1" th:errors="*{password}"></div>
                     </div>
                     <div class="form-floating mb-4">
-                        <input type="password" class="form-control" th:field="*{repeatPassword}" id="repeat-password" placeholder="Repeat new password" required>
-                        <label for="repeat-password">Repeat new password</label>
+                        <input type="password" class="form-control" th:field="*{repeatPassword}" id="repeat-password"
+                               th:placeholder="#{reset-password.repeat-password.placeholder}" placeholder="Repeat new password" required>
+                        <label for="repeat-password" th:text="#{reset-password.repeat-password.label}">Repeat new password</label>
                         <div th:if="${#fields.hasErrors('repeatPassword')}" class="text-danger small mt-1" th:errors="*{repeatPassword}"></div>
                     </div>
                     <div>
-                        <button class="btn btn-lg btn-primary mb-4 w-100" type="submit">Set new password</button>
+                        <button class="btn btn-lg btn-primary mb-4 w-100" type="submit" th:text="#{reset-password.submit}">Set new password</button>
                         <div class="text-center">
-                            <p><a th:href="@{/sign-in}">Back to sign in</a></p>
+                            <p><a th:href="@{/sign-in}" th:text="#{back-to-sign-in}">Back to sign in</a></p>
                         </div>
                     </div>
                 </form>
diff --git a/src/main/resources/templates/search-component.html b/src/main/resources/templates/search-component.html
index 04f51c0..da88ee8 100644
--- a/src/main/resources/templates/search-component.html
+++ b/src/main/resources/templates/search-component.html
@@ -1,8 +1,8 @@
 <form class="row w-100" method="get" th:action="@{/search}">
     <div class="input-group">
-        <input aria-label="Recipient's username" class="form-control" id="search" name="q"
-               placeholder="Enter the location name"
+        <input th:attr="aria-label=#{search.aria-label}" aria-label="Search for a location" class="form-control" id="search" name="q"
+               th:placeholder="#{search.placeholder}" placeholder="Enter the location name"
                required type="text">
-        <button class="btn btn-primary" type="submit">Search</button>
+        <button class="btn btn-primary" type="submit" th:text="#{search.submit}">Search</button>
     </div>
 </form>
diff --git a/src/main/resources/templates/search.html b/src/main/resources/templates/search.html
index 0c1b5b1..ade0b5b 100644
--- a/src/main/resources/templates/search.html
+++ b/src/main/resources/templates/search.html
@@ -10,7 +10,7 @@
 <th:block th:fragment="bodyContent">
     <div th:replace="~{header-component}"></div>
     <div class="container">
-        <h2>Search results</h2>
+        <h2 th:text="#{search.results-title}">Search results</h2>
         <div class="row row-cols-3 mt-3">
             <div class="col mb-3" th:each="location : ${foundLocations}">
                 <div class="card">
@@ -26,13 +26,13 @@ <h5 class="card-title" th:text="${location.name}">Name</h5>
                             <span th:if="${location.country == null} and ${location.state != null}"
                                   th:text="${location.state}">State</span>
 
-                            <span th:if="${location.country == null} and ${location.state == null}">No data</span>
+                            <span th:if="${location.country == null} and ${location.state == null}" th:text="#{search.no-data}">No data</span>
                         </p>
                         <form th:action="@{/search/add}" method="post">
                             <input type="hidden" th:name="name" th:value="${location.name}">
                             <input type="hidden" th:name="latitude" th:value="${location.latitude}">
                             <input type="hidden" th:name="longitude" th:value="${location.longitude}">
-                            <button class="btn btn-primary" type="submit">Add to tracked locations</button>
+                            <button class="btn btn-primary" type="submit" th:text="#{search.add-location}">Add to tracked locations</button>
                         </form>
                     </div>
                 </div>
diff --git a/src/main/resources/templates/sign-in.html b/src/main/resources/templates/sign-in.html
index c64bd4d..87724ec 100644
--- a/src/main/resources/templates/sign-in.html
+++ b/src/main/resources/templates/sign-in.html
@@ -14,40 +14,43 @@
         <div class="d-flex justify-content-center align-items-center vh-100">
             <div class="bg-image"></div>
             <div class="form mx-auto row p-4">
-                <h3 class="my-4 text-center">Sign in</h3>
+                <h3 class="my-4 text-center" th:text="#{signin.title}">Sign in</h3>
 
                 <form method="post" th:action="@{/sign-in}">
                     <input type="hidden" name="redirect" th:value="${redirect}">
                     <div class="form-floating mb-4">
-                        <input type="text" class="form-control" id="email" name="email" placeholder="name@example.com" required>
-                        <label for="email">Email</label>
+                        <input type="text" class="form-control" id="email" name="email"
+                               th:placeholder="#{signin.email.placeholder}" placeholder="name@example.com" required>
+                        <label for="email" th:text="#{signin.email.label}">Email</label>
                     </div>
                     <div class="form-floating mb-4">
-                        <input type="password" class="form-control" id="password" name="password" placeholder="Password" required>
-                        <label for="password">Password</label>
+                        <input type="password" class="form-control" id="password" name="password"
+                               th:placeholder="#{signin.password.placeholder}" placeholder="Password" required>
+                        <label for="password" th:text="#{signin.password.label}">Password</label>
                     </div>
                     <div class="d-flex justify-content-between align-items-center mb-4">
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input" id="remember-me" name="remember-me" value="true">
-                            <label class="form-check-label small" for="remember-me">Remember me</label>
+                            <label class="form-check-label small" for="remember-me" th:text="#{signin.remember-me}">Remember me</label>
                         </div>
-                        <a th:href="@{/forgot-password}" class="small">Forgot password?</a>
+                        <a th:href="@{/forgot-password}" class="small" th:text="#{signin.forgot-password}">Forgot password?</a>
                     </div>
                     <div>
-                        <button class="btn btn-lg btn-primary mb-4 w-100" type="submit">Sign in</button>
+                        <button class="btn btn-lg btn-primary mb-4 w-100" type="submit" th:text="#{signin.submit}">Sign in</button>
                         <div class="text-center">
-                            <p>Don't have an account yet -
-                                <a th:if="${redirect != null}" th:href="@{/sign-up(redirect=${redirect})}">Sign up</a>
-                                <a th:unless="${redirect != null}" th:href="@{/sign-up}">Sign up</a>
+                            <p>
+                                <span th:text="#{signin.no-account}">Don't have an account yet -</span>
+                                <a th:if="${redirect != null}" th:href="@{/sign-up(redirect=${redirect})}" th:text="#{signin.sign-up-link}">Sign up</a>
+                                <a th:unless="${redirect != null}" th:href="@{/sign-up}" th:text="#{signin.sign-up-link}">Sign up</a>
                             </p>
                         </div>
                     </div>
                 </form>
 
                 <form method="post" th:action="@{/resend-verification}" class="mt-2 text-center" th:if="${param.unverified != null}">
-                    <p class="small text-muted mb-2">Didn't get a verification email?</p>
+                    <p class="small text-muted mb-2" th:text="#{signin.resend.prompt}">Didn't get a verification email?</p>
                     <input type="hidden" name="email" th:value="${param.email != null ? param.email[0] : ''}">
-                    <button type="submit" class="btn btn-outline-secondary btn-sm">Resend verification email</button>
+                    <button type="submit" class="btn btn-outline-secondary btn-sm" th:text="#{signin.resend.button}">Resend verification email</button>
                 </form>
             </div>
         </div>
diff --git a/src/main/resources/templates/sign-up.html b/src/main/resources/templates/sign-up.html
index e149a90..c50f519 100644
--- a/src/main/resources/templates/sign-up.html
+++ b/src/main/resources/templates/sign-up.html
@@ -12,39 +12,47 @@
         <div class="d-flex justify-content-center align-items-center vh-100">
             <div class="bg-image"></div>
             <div class="form mx-auto row p-4">
-                <h3 class="my-4 text-center">Sign up</h3>
+                <h3 class="my-4 text-center" th:text="#{signup.title}">Sign up</h3>
 
                 <form method="post" th:action="@{/sign-up}" th:object="${user}">
                     <input type="hidden" name="redirect" th:value="${redirect}" />
                     <div class="form-floating mb-4">
-                        <input type="text" class="form-control" th:field="*{firstName}" id="first-name" name="first-name" placeholder="John" required>
-                        <label for="first-name">First name</label>
+                        <input type="text" class="form-control" th:field="*{firstName}" id="first-name" name="first-name"
+                               th:placeholder="#{signup.first-name.placeholder}" placeholder="John" required>
+                        <label for="first-name" th:text="#{signup.first-name.label}">First name</label>
                         <div th:if="${#fields.hasErrors('firstName')}" class="text-danger small mt-1" th:errors="*{firstName}"></div>
                     </div>
                     <div class="form-floating mb-4">
-                        <input type="text" class="form-control" th:field="*{lastName}" id="last-name" name="last-name" placeholder="Doe" required>
-                        <label for="last-name">Last name</label>
+                        <input type="text" class="form-control" th:field="*{lastName}" id="last-name" name="last-name"
+                               th:placeholder="#{signup.last-name.placeholder}" placeholder="Doe" required>
+                        <label for="last-name" th:text="#{signup.last-name.label}">Last name</label>
                         <div th:if="${#fields.hasErrors('lastName')}" class="text-danger small mt-1" th:errors="*{lastName}"></div>
                     </div>
                     <div class="form-floating mb-4">
-                        <input type="text" class="form-control" th:field="*{email}" id="email" name="email" placeholder="name@example.com" required>
-                        <label for="email">Email</label>
+                        <input type="text" class="form-control" th:field="*{email}" id="email" name="email"
+                               th:placeholder="#{signin.email.placeholder}" placeholder="name@example.com" required>
+                        <label for="email" th:text="#{signin.email.label}">Email</label>
                         <div th:if="${#fields.hasErrors('email')}" class="text-danger small mt-1" th:errors="*{email}"></div>
                     </div>
                     <div class="form-floating mb-4">
-                        <input type="password" class="form-control" th:field="*{password}" id="password" name="password" placeholder="Password" required>
-                        <label for="password">Password</label>
+                        <input type="password" class="form-control" th:field="*{password}" id="password" name="password"
+                               th:placeholder="#{signin.password.placeholder}" placeholder="Password" required>
+                        <label for="password" th:text="#{signin.password.label}">Password</label>
                         <div th:if="${#fields.hasErrors('password')}" class="text-danger small mt-1" th:errors="*{password}"></div>
                     </div>
                     <div class="form-floating mb-4">
-                        <input type="password" class="form-control"  th:field="*{repeatPassword}" id="repeat-password" name="repeat-password" placeholder="Repeat password" required>
-                        <label for="repeat-password">Repeat password</label>
+                        <input type="password" class="form-control"  th:field="*{repeatPassword}" id="repeat-password" name="repeat-password"
+                               th:placeholder="#{signup.repeat-password.placeholder}" placeholder="Repeat password" required>
+                        <label for="repeat-password" th:text="#{signup.repeat-password.label}">Repeat password</label>
                         <div th:if="${#fields.hasErrors('repeatPassword')}" class="text-danger small mt-1" th:errors="*{repeatPassword}"></div>
                     </div>
                     <div>
-                        <button class="btn btn-lg btn-primary mb-4 w-100" type="submit">Sign up</button>
+                        <button class="btn btn-lg btn-primary mb-4 w-100" type="submit" th:text="#{signup.submit}">Sign up</button>
                         <div class="text-center">
-                            <p>Already have an account - <a href="sign-in" th:href="@{/sign-in}">Sign in</a></p>
+                            <p>
+                                <span th:text="#{signup.have-account}">Already have an account -</span>
+                                <a href="sign-in" th:href="@{/sign-in}" th:text="#{signup.sign-in-link}">Sign in</a>
+                            </p>
                         </div>
                     </div>
                 </form>

From 4856345f7dac7de433febd8cd0b52fad197b87f6 Mon Sep 17 00:00:00 2001
From: podlLev <pidlisnyilev@gmail.com>
Date: Wed, 29 Jul 2026 08:53:32 +0300
Subject: [PATCH 4/9] feat(weather-api): add WeatherApiLocale to resolve
 request locale to an OWM lang code

---
 .../service/integration/WeatherApiLocale.java | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 src/main/java/com/weatherviewer/service/integration/WeatherApiLocale.java

diff --git a/src/main/java/com/weatherviewer/service/integration/WeatherApiLocale.java b/src/main/java/com/weatherviewer/service/integration/WeatherApiLocale.java
new file mode 100644
index 0000000..a89ab74
--- /dev/null
+++ b/src/main/java/com/weatherviewer/service/integration/WeatherApiLocale.java
@@ -0,0 +1,42 @@
+package com.weatherviewer.service.integration;
+
+import org.springframework.context.i18n.LocaleContextHolder;
+
+import java.util.Set;
+
+/**
+ * Maps the current request's locale to a language code OpenWeatherMap
+ * accepts for its {@code lang} query parameter, controlling the language of
+ * weather {@code description} text in the API response.
+ * <p>
+ * Used by both {@link WeatherApiClient} (to build the actual request) and
+ * {@link WeatherApiCache} (to key cached responses per resolved language —
+ * without that, a location's weather cached for one language would be
+ * served as-is to a request in another language, since the raw JSON,
+ * descriptions included, is what's cached).
+ */
+public final class WeatherApiLocale {
+
+    /**
+     * Languages we ask OpenWeatherMap to translate descriptions into.
+     * Keep in sync with the {@code messages_XX.properties} bundles this
+     * application ships — no point requesting a language the UI itself
+     * can't render around.
+     */
+    private static final Set<String> SUPPORTED_LANGUAGES = Set.of("en", "uk");
+
+    private static final String DEFAULT_LANGUAGE = "en";
+
+    private WeatherApiLocale() {
+    }
+
+    /**
+     * @return the current {@link LocaleContextHolder} locale's language,
+     * if OpenWeatherMap is known to support it, otherwise {@code "en"}.
+     */
+    public static String resolve() {
+        String language = LocaleContextHolder.getLocale().getLanguage();
+        return SUPPORTED_LANGUAGES.contains(language) ? language : DEFAULT_LANGUAGE;
+    }
+
+}

From b148270a190903c898e5f4322e3f52230d2e8b8c Mon Sep 17 00:00:00 2001
From: podlLev <pidlisnyilev@gmail.com>
Date: Wed, 29 Jul 2026 08:53:49 +0300
Subject: [PATCH 5/9] feat(weather-api): request OpenWeatherMap descriptions in
 the resolved locale

---
 .../service/integration/WeatherApiClient.java             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/weatherviewer/service/integration/WeatherApiClient.java b/src/main/java/com/weatherviewer/service/integration/WeatherApiClient.java
index 64c297b..534bc6c 100644
--- a/src/main/java/com/weatherviewer/service/integration/WeatherApiClient.java
+++ b/src/main/java/com/weatherviewer/service/integration/WeatherApiClient.java
@@ -178,24 +178,24 @@ private static String maskApiKey(String url) {
         return APPID_PATTERN.matcher(url).replaceAll("$1***");
     }
 
-    /** Builds a request URL for a city-name-based endpoint, with metric units and English descriptions. */
+    /** Builds a request URL for a city-name-based endpoint, with metric units and locale-appropriate descriptions. */
     private String buildCityUrl(String suffix, String city) {
         return UriComponentsBuilder.fromUri(URI.create(baseApiUrl + suffix))
                 .queryParam("appid", apiKey)
                 .queryParam("units", "metric")
-                .queryParam("lang", "en")
+                .queryParam("lang", WeatherApiLocale.resolve())
                 .queryParam("q", city)
                 .encode(StandardCharsets.UTF_8)
                 .build()
                 .toUriString();
     }
 
-    /** Builds a request URL for a coordinate-based endpoint, with metric units and English descriptions. */
+    /** Builds a request URL for a coordinate-based endpoint, with metric units and locale-appropriate descriptions. */
     private String buildCoordsUrl(String suffix, double latitude, double longitude) {
         return UriComponentsBuilder.fromUri(URI.create(baseApiUrl + suffix))
                 .queryParam("appid", apiKey)
                 .queryParam("units", "metric")
-                .queryParam("lang", "en")
+                .queryParam("lang", WeatherApiLocale.resolve())
                 .queryParam("lat", latitude)
                 .queryParam("lon", longitude)
                 .encode(StandardCharsets.UTF_8)

From 1a8e236b9f3eeef7d963dff34ea11e0013fc6a3f Mon Sep 17 00:00:00 2001
From: podlLev <pidlisnyilev@gmail.com>
Date: Wed, 29 Jul 2026 08:54:42 +0300
Subject: [PATCH 6/9] test(weather-api): pin LocaleContextHolder in
 WeatherApiClientTest, add uk/fallback cases

---
 .../integration/WeatherApiClientTest.java     | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/test/java/com/weatherviewer/service/integration/WeatherApiClientTest.java b/src/test/java/com/weatherviewer/service/integration/WeatherApiClientTest.java
index 5eb62e7..0e77d2c 100644
--- a/src/test/java/com/weatherviewer/service/integration/WeatherApiClientTest.java
+++ b/src/test/java/com/weatherviewer/service/integration/WeatherApiClientTest.java
@@ -16,6 +16,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.client.RestClient;
 import org.springframework.web.client.RestClientResponseException;
@@ -23,6 +24,7 @@
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.util.List;
+import java.util.Locale;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -62,6 +64,10 @@ void setUp() {
         ReflectionTestUtils.setField(client, "forecastApiUrlSuffix", "/data/2.5/forecast");
         ReflectionTestUtils.setField(client, "geocodingApiUrlSuffix", "/geo/1.0/direct");
 
+        // WeatherApiLocale.resolve() reads LocaleContextHolder; pin it so the
+        // "lang=en" assertions below don't depend on the host JVM's default locale.
+        LocaleContextHolder.setLocale(Locale.ENGLISH);
+
         lenient().doReturn(requestHeadersUriSpec).when(restClient).get();
         lenient().doReturn(requestHeadersSpec).when(requestHeadersUriSpec).uri(any(URI.class));
         lenient().when(requestHeadersSpec.retrieve()).thenReturn(responseSpec);
@@ -74,6 +80,7 @@ void setUp() {
     @AfterEach
     void tearDown() {
         ((Logger) LoggerFactory.getLogger(WeatherApiClient.class)).detachAppender(logAppender);
+        LocaleContextHolder.resetLocaleContext();
     }
 
     @Test
@@ -242,6 +249,34 @@ void fetchCurrentWeatherByCity_buildsUrlWithMetricUnitsAndEnglishLang() throws E
         assertThat(uri).contains("appid=" + SECRET_API_KEY);
     }
 
+    @Test
+    void fetchCurrentWeatherByCity_ukrainianLocale_buildsUrlWithUkrainianLang() throws Exception {
+        LocaleContextHolder.setLocale(new Locale("uk"));
+        JsonNode mockNode = mock(JsonNode.class);
+        when(responseSpec.body(String.class)).thenReturn("{}");
+        when(objectMapper.readTree(anyString())).thenReturn(mockNode);
+
+        client.fetchCurrentWeatherByCity("Kyiv");
+
+        ArgumentCaptor<URI> uriCaptor = ArgumentCaptor.forClass(URI.class);
+        verify(requestHeadersUriSpec).uri(uriCaptor.capture());
+        assertThat(uriCaptor.getValue().toString()).contains("lang=uk");
+    }
+
+    @Test
+    void fetchCurrentWeatherByCity_unsupportedLocale_fallsBackToEnglishLang() throws Exception {
+        LocaleContextHolder.setLocale(Locale.GERMAN);
+        JsonNode mockNode = mock(JsonNode.class);
+        when(responseSpec.body(String.class)).thenReturn("{}");
+        when(objectMapper.readTree(anyString())).thenReturn(mockNode);
+
+        client.fetchCurrentWeatherByCity("Kyiv");
+
+        ArgumentCaptor<URI> uriCaptor = ArgumentCaptor.forClass(URI.class);
+        verify(requestHeadersUriSpec).uri(uriCaptor.capture());
+        assertThat(uriCaptor.getValue().toString()).contains("lang=en");
+    }
+
     @Test
     void fetchForecastByCity_buildsUrlWithForecastSuffix() throws Exception {
         JsonNode mockNode = mock(JsonNode.class);

From 3ce61c738fca1ef8b112161fb4533613157d79a9 Mon Sep 17 00:00:00 2001
From: podlLev <pidlisnyilev@gmail.com>
Date: Wed, 29 Jul 2026 08:54:53 +0300
Subject: [PATCH 7/9] test(weather-api): add WeatherApiLocaleTest

---
 .../integration/WeatherApiLocaleTest.java     | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 src/test/java/com/weatherviewer/service/integration/WeatherApiLocaleTest.java

diff --git a/src/test/java/com/weatherviewer/service/integration/WeatherApiLocaleTest.java b/src/test/java/com/weatherviewer/service/integration/WeatherApiLocaleTest.java
new file mode 100644
index 0000000..00e3ba4
--- /dev/null
+++ b/src/test/java/com/weatherviewer/service/integration/WeatherApiLocaleTest.java
@@ -0,0 +1,42 @@
+package com.weatherviewer.service.integration;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.i18n.LocaleContextHolder;
+
+import java.util.Locale;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class WeatherApiLocaleTest {
+
+    @AfterEach
+    void tearDown() {
+        LocaleContextHolder.resetLocaleContext();
+    }
+
+    @Test
+    void resolve_english_returnsEn() {
+        LocaleContextHolder.setLocale(Locale.ENGLISH);
+        assertThat(WeatherApiLocale.resolve()).isEqualTo("en");
+    }
+
+    @Test
+    void resolve_ukrainian_returnsUk() {
+        LocaleContextHolder.setLocale(new Locale("uk"));
+        assertThat(WeatherApiLocale.resolve()).isEqualTo("uk");
+    }
+
+    @Test
+    void resolve_ukrainianRegionVariant_returnsUk() {
+        LocaleContextHolder.setLocale(new Locale("uk", "UA"));
+        assertThat(WeatherApiLocale.resolve()).isEqualTo("uk");
+    }
+
+    @Test
+    void resolve_unsupportedLanguage_fallsBackToEn() {
+        LocaleContextHolder.setLocale(Locale.GERMAN);
+        assertThat(WeatherApiLocale.resolve()).isEqualTo("en");
+    }
+
+}

From 52b214ca7e180a9bb0b3db23f05fb1b4134751fc Mon Sep 17 00:00:00 2001
From: podlLev <pidlisnyilev@gmail.com>
Date: Wed, 29 Jul 2026 08:55:51 +0300
Subject: [PATCH 8/9] feat(i18n): add weather-condition.* translated labels for
 the WeatherCondition enum

---
 src/main/resources/messages.properties     | 12 +++++++++++-
 src/main/resources/messages_uk.properties  |  9 +++++++++
 src/main/resources/templates/forecast.html |  4 ++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index 55dbdfe..75e2a6b 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -79,6 +79,16 @@ search.add-location=Add to tracked locations
 forecast.hourly-title=Hourly Forecast
 forecast.daily-title=Daily Forecast
 
+# Fallback labels for both forecast sections when a real per-reading
+weather-condition.THUNDERSTORM=Thunderstorm
+weather-condition.DRIZZLE=Drizzle
+weather-condition.RAIN=Rain
+weather-condition.SNOW=Snow
+weather-condition.ATMOSPHERE=Fog/Mist
+weather-condition.CLEAR=Clear
+weather-condition.CLOUDS=Clouds
+weather-condition.UNDEFINED=No data
+
 # --- Profile page (profile.html) ---
 profile.title=Account Settings
 profile.first-name.placeholder=First Name
@@ -113,4 +123,4 @@ home.forecast-button=Forecast
 home.no-location.title=Location Required for Weather Information
 home.no-location.instructions=Please add a location to view weather. You can do it by using the search bar above.
 home.pagination.previous=Previous
-home.pagination.next=Next
+home.pagination.next=Next
\ No newline at end of file
diff --git a/src/main/resources/messages_uk.properties b/src/main/resources/messages_uk.properties
index 4e8c31a..d6836ba 100644
--- a/src/main/resources/messages_uk.properties
+++ b/src/main/resources/messages_uk.properties
@@ -79,6 +79,15 @@ search.add-location=Додати до відстежуваних місць
 forecast.hourly-title=Погодинний прогноз
 forecast.daily-title=Щоденний прогноз
 
+weather-condition.THUNDERSTORM=Гроза
+weather-condition.DRIZZLE=Мряка
+weather-condition.RAIN=Дощ
+weather-condition.SNOW=Сніг
+weather-condition.ATMOSPHERE=Туман
+weather-condition.CLEAR=Ясно
+weather-condition.CLOUDS=Хмарно
+weather-condition.UNDEFINED=Немає даних
+
 # --- Profile page (profile.html) ---
 profile.title=Налаштування акаунта
 profile.first-name.placeholder=Ім'я
diff --git a/src/main/resources/templates/forecast.html b/src/main/resources/templates/forecast.html
index f48f288..b03839f 100644
--- a/src/main/resources/templates/forecast.html
+++ b/src/main/resources/templates/forecast.html
@@ -22,7 +22,7 @@ <h2 class="mb-3" th:text="#{forecast.hourly-title}">Hourly Forecast</h2>
                             <h5 class="card-title mb-2" th:text="${#dates.format(forecast.date, 'HH:mm')}"></h5>
                             <h3 class="text-primary mb-2" th:text="${#numbers.formatDecimal(forecast.temperature, 1, 2)} + ${temperatureSymbol}"></h3>
                             <img class="mb-2 mx-auto" th:src="@{'/images/' + ${forecast.weatherCondition} + '-' + ${forecast.timeOfDay} + '.svg'}" style="width:150px;" th:alt="|${forecast.weatherCondition} + ' ' + ${forecast.timeOfDay}|">
-                            <p class="card-text text-muted mb-0" th:text="${#strings.capitalize(forecast.description)}"></p>
+                            <p class="card-text text-muted mb-0" th:text="#{__${'weather-condition.' + forecast.weatherCondition}__}"></p>
                         </div>
                     </div>
                 </div>
@@ -43,7 +43,7 @@ <h5 class="card-title mb-2">
                             <h3 class="text-primary mb-1" th:text="${#numbers.formatDecimal(forecast.temperature, 1, 2)} + ${temperatureSymbol}"></h3>
                             <p class="text-secondary mb-2" th:text="${#numbers.formatDecimal(forecast.temperatureMinimum, 1, 2)} + ${temperatureSymbol}"></p>
                             <img class="mb-2 mx-auto" th:src="@{'/images/' + ${forecast.weatherCondition} + '-' + ${forecast.timeOfDay} + '.svg'}" style="width:150px;" th:alt="|${forecast.weatherCondition} + ' ' + ${forecast.timeOfDay}|">
-                            <p class="card-text text-muted mb-0" th:text="${#strings.capitalize(#strings.toLowerCase(forecast.weatherCondition))}"></p>
+                            <p class="card-text text-muted mb-0" th:text="#{__${'weather-condition.' + forecast.weatherCondition}__}"></p>
                         </div>
                     </div>
                 </div>

From ec2ec247a1de84d802914a9ec695430cd964ca14 Mon Sep 17 00:00:00 2001
From: podlLev <pidlisnyilev@gmail.com>
Date: Wed, 29 Jul 2026 09:25:42 +0300
Subject: [PATCH 9/9] chore(release): bump version to 1.2.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8d50792..2928ac7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,9 +10,9 @@
     </parent>
     <groupId>com</groupId>
     <artifactId>WeatherViewer</artifactId>
-    <version>1.1.0-RELEASE</version>
+    <version>1.2.0</version>
     <name>WeatherViewer</name>
-    <description>A Spring Boot application for checking weather forecasts, managing favorite locations, and tracking request metrics with built-in rate limiting.</description>
+    <description>A Spring Boot application for checking weather forecasts, managing favorite locations, and tracking request metrics with built-in rate limiting. Supports English and Ukrainian locales.</description>
     <url/>
     <licenses>
         <license>