From da9f5c2806eb12bc049e7c86858ea388c74fe8a2 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Sun, 22 Sep 2024 02:25:03 +0900
Subject: [PATCH 1/2] docs: add how to use shared locale messages on
 composition api

---
 docs/guide/advanced/composition.md | 55 ++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/docs/guide/advanced/composition.md b/docs/guide/advanced/composition.md
index fe2329d07..09e3361d7 100644
--- a/docs/guide/advanced/composition.md
+++ b/docs/guide/advanced/composition.md
@@ -377,10 +377,11 @@ const { t, d, n, tm, locale } = useI18n({
 // Something to do here ...
 ```
 
+### Locale messages
 
-If you use i18n custom blocks  in SFC as i18n resource of locale messages, it  will be merged with the locale messages specified by the `messages` option of `useI18n`.
+If you use i18n custom blocks in SFC as i18n resource of locale messages, it will be merged with the locale messages specified by the `messages` option of `useI18n`.
 
-The following is an example of using  i18n custom blocks and `useI18n` options:
+The following is an example of using i18n custom blocks and `useI18n` options:
 
 ```vue
 <script setup>
@@ -410,6 +411,56 @@ availableLocales.forEach(locale => {
 In this example, the definition of resources is separated from i18n custom blocks and the `messages` option of `useI18n`, but in local scope, resource messages are specified in the `messages` option in a lump sum for administrative purposes in resource messages or define all resource messages in the i18n custom blocks, which is preferable.
 :::
 
+### Shared locale messages for components
+
+In Leacy API mode, shared locale messages are used in components with the `sharedMessages` option.
+
+In composition API mode, use `mergeLocaleMessage` exported by `useI18n`.
+
+Common locale messages example:
+
+```js
+export default {
+  en: {
+    buttons: {
+      save: "Save",
+      // ...
+    }
+  },
+  ja: {
+    buttons: {
+      save: "保存",
+      // ...
+    }
+  }
+}
+```
+
+use `mergeLocaleMessage` on Components:
+
+```vue
+<script setup>
+import { useI18n } from 'vue-i18n'
+import commonMessages from './locales/common'
+
+const { t, mergeLocaleMessage } = useI18n({
+  locale: 'en',
+  messages: {
+    en: {
+      hello: 'Hello!'
+    },
+    ja: {
+      hello: 'こんにちは！'
+    }
+  }
+})
+
+for (const locale of ['en', 'ja']) {
+  mergeLocaleMessage(locale, commonMessages[locale])
+}
+</script>
+```
+
 ## Locale Changing
 
 ### Global Scope

From 23d90e908e94da35394e428ac26929dba3159879 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Sun, 22 Sep 2024 02:37:42 +0900
Subject: [PATCH 2/2] chore: fix ci

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d895df888..2b5332eed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -110,6 +110,8 @@ jobs:
   test-e2e:
     name: E2E test
 
+    if: github.event_name == 'push' &&
+      !startsWith(github.event.head_commit.message, 'docs')
     needs:
       - build