krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 23:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert Bailey datetime PR

Browse Source
This commit is contained in:
SabreCat
2022-02-09 11:17:15 -06:00
parent 2ac5ebe01a
commit 81363feb26
4 changed files with 58717 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20122
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

38780
website/client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

20
website/client/src/components/news/newsContent.vue
View File

@@ -20,11 +20,9 @@
class="draft" class="draft"
>DRAFT</small> >DRAFT</small>
<h2 class="title"> <h2 class="title">
{{ post.title.toUpperCase() }} {{ getPostDate(post) }} - {{ post.title.toUpperCase() }}
</h2> </h2>
<small>
{{ getPostedOn(post) }}
</small>
<hr> <hr>
<div v-html="renderMarkdown(post.text)"></div> <div v-html="renderMarkdown(post.text)"></div>
@@ -53,8 +51,7 @@ h1 {
} }
.title { .title {
text-align: left; display: inline;
margin-bottom: 4px;
} }
.draft { .draft {
@@ -68,7 +65,7 @@ h1 {
</style> </style>
<script> <script>
import moment from 'moment-timezone'; import moment from 'moment';
import habiticaMarkdown from 'habitica-markdown'; import habiticaMarkdown from 'habitica-markdown';
import { mapState } from '@/libs/store'; import { mapState } from '@/libs/store';
import seasonalNPC from '@/mixins/seasonalNPC'; import seasonalNPC from '@/mixins/seasonalNPC';
@@ -108,12 +105,9 @@ export default {
renderMarkdown (text) { renderMarkdown (text) {
return habiticaMarkdown.unsafeHTMLRender(text); return habiticaMarkdown.unsafeHTMLRender(text);
}, },
getPostedOn (post) { getPostDate (post) {
const publishDate = moment(post.publishDate) const format = this.user ? this.user.preferences.dateFormat.toUpperCase() : 'MM/DD/yyyy';
.utcOffset(-300) return moment(post.publishDate).format(format);
.format(this.user.preferences.dateFormat.toUpperCase());
const publishTime = moment(post.publishDate).tz('America/New_York').format('LT z');
return this.$t('newStuffPostedOn', { publishDate, publishTime });
}, },
}, },
}; };

1
website/common/locales/en/npc.json
View File

@@ -83,7 +83,6 @@
"invalidQuantity": "Quantity to purchase must be a positive whole number.", "invalidQuantity": "Quantity to purchase must be a positive whole number.",
"USD": "(USD)", "USD": "(USD)",
"newStuff": "New Stuff by Bailey", "newStuff": "New Stuff by Bailey",
"newStuffPostedOn": "Posted on <%= publishDate %>, <%= publishTime %>",
"newBaileyUpdate": "New Bailey Update!", "newBaileyUpdate": "New Bailey Update!",
"tellMeLater": "Tell Me Later", "tellMeLater": "Tell Me Later",
"dismissAlert": "Dismiss This Alert", "dismissAlert": "Dismiss This Alert",