Skip to content

Commit a61cce0

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/dev' into docs/home-page
2 parents 071dfa7 + 567e9a7 commit a61cce0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+558
-358
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ Reporting a bug?
44
================
55
66
- Always search for your issue first. It may have already been answered, planned or fixed in some branch.
7+
- Open one issue per subject. Cluttered issues will be closed.
78
- Make sure to only create issues for the newest version.
89
- Create a declarative title and describe clearly the steps necessary to reproduce the issue. If an issue labeled "need repro" receives no further input from the issue author for more than 3 days, it will be closed.
9-
- If you want to show your code please use [Codepen](http://codepen.io/pen/) or [JSFiddle](https://jsfiddle.net/). You could start with [this template](http://codepen.io/vue-material/pen/WGavBE).
10-
- In case you found a solution by yourself, it could be helpful to explain how you fixed it.
10+
- If you want to show your code, please use [Codepen](http://codepen.io/pen/) or [JSFiddle](https://jsfiddle.net/). You can start with [this template](https://codepen.io/vue-material/pen/RxGmyb).
11+
- In case you found a solution by yourself, it could be helpful to explain how you have fixed it.
1112
- For bugs that involves build setups, you can create a reproduction repository with steps in the README.
12-
- If your issue is resolved but still open, don’t hesitate to close it. In case you found a solution by yourself, it could be helpful to explain how you fixed it.
13+
- If your issue is resolved but still open, don’t hesitate to close it.
1314
1415
Have a feature request?
1516
=======================

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Build well-designed apps that can fit on every screen with support to all modern
3131
## Sponsorship
3232

3333
Vue Material is proudly sponsored by [Rollbar](https://cs.berry.sh/c/c0597778-f465-4788-abe3-8711cc087774
34-
). They provide real-time error monitoring, alerting, and analytics for developers.
34+
). They provide real-time JavaScript error monitoring, alerting, and analytics for developers. :rocket:
3535

3636
You can try Rollbar for free at [https://rollbar.com](https://cs.berry.sh/c/c0597778-f465-4788-abe3-8711cc087774
3737
) <img src="https://cs.berry.sh/l/c0597778-f465-4788-abe3-8711cc087774/pixel.png" />

docs/app/components/AdManager.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<a :href="linkHref" class="code-sponsor-content" target="_blank" rel="noopener">
77
<strong class="code-sponsor-name">Rollbar</strong>
8-
<span class="code-sponsor-description">Real-time error monitoring, alerting, and analytics for developers 🚀</span>
8+
<span class="code-sponsor-description">Real-time JavaScript error monitoring, alerting, and analytics for developers 🚀</span>
99
</a>
1010

1111
<img class="code-sponsor-pixel" :src="pixelHref" />

docs/app/config.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Vue from 'vue'
22
import Axios from 'axios'
33
import VueRouter from 'vue-router'
44
import Vuei18n from 'vue-i18n'
5-
import enUS from './i18n/en-US'
5+
import i18nLocales from './i18n'
66
import { routes } from './routes'
77
import createRoute from './routes'
88

@@ -18,12 +18,10 @@ const mappedRoutes = routes.map(route => ({
1818
component: () => import(`./pages/${route.page}`)
1919
}))
2020

21-
export const currentLang = enUS
21+
export const currentLang = i18nLocales.enUS
2222
export const i18n = new Vuei18n({
23-
locale: 'en-US',
24-
messages: {
25-
'en-US': enUS
26-
}
23+
locale: 'enUS',
24+
messages: i18nLocales
2725
})
2826

2927
export const router = new VueRouter({

docs/app/i18n/en-US.js

Lines changed: 0 additions & 265 deletions
This file was deleted.

docs/app/i18n/en-US/components.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
export default {
2+
code: {
3+
copyMessage: 'Code copied!',
4+
copy: 'Copy'
5+
}
6+
}

docs/app/i18n/en-US/index.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import components from './components'
2+
import pages from './pages'
3+
4+
export default {
5+
aboutMaterial: 'About Vue Material',
6+
madeWith: 'Made with',
7+
by: 'by',
8+
code: 'Code',
9+
example: 'Example',
10+
default: 'Default',
11+
darkTheme: 'Dark Theme',
12+
lightTheme: 'Light Theme',
13+
14+
pages,
15+
components
16+
}

0 commit comments

Comments
 (0)