- Fix current local date format

- Add warning to merge collections
- Change format of date tag in save tabs

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "app",
-	"version": "5.6.71",
+	"version": "5.6.72",
 	"description": "All-in-one bookmark manager",
 	"author": "Rustem Mussabekov",
 	"license": "MIT",

src/co/collections/items/selectMode.js

@@ -17,7 +17,7 @@ export default class CollectionsSelectMode extends React.Component {
     onMergeSelected = async()=>{
         const { selectMode: { ids }, actions: { mergeSelected } } = this.props
 
-        if (await Confirm(`${t.s('areYouSure')}\n${t.s('merge')} ${ids.length} ${t.s('collectionsCount')}`))
+        if (await Confirm(`${t.s('areYouSure')}\n${t.s('merge')} ${ids.length} ${t.s('collectionsCount')}.\nAll selected collections will be merged into one.`))
             mergeSelected()
     }
 

src/modules/format/date/index.js

@@ -3,4 +3,5 @@ export * from './short'
 export * from './long'
 export * from './longTime'
 export * from './month'
-export * from './shortTime'
+export * from './shortTime'
+export * from './numeric'

src/modules/format/date/long.js

@@ -1,13 +1,12 @@
 import React from 'react'
-import t from '~t'
 import { parseDate } from './parse'
 import dateFnsFormat from 'date-fns/format'
 
 let _format
 function getFormat() {
     if (!_format)
         _format = new Intl.DateTimeFormat(
-            t.currentLang,
+            undefined,
             {
                 year: 'numeric',
                 month: 'long',

src/modules/format/date/longTime.js

@@ -1,13 +1,12 @@
 import React from 'react'
-import t from '~t'
 import { parseDate } from './parse'
 import dateFnsFormat from 'date-fns/format'
 
 let _format
 function getFormat() {
     if (!_format)
         _format = new Intl.DateTimeFormat(
-            t.currentLang,
+            undefined,
             {
                 hour12: new Date().toLocaleTimeString().toString().match(/am|pm/i) ? true : false,
                 year: 'numeric',

src/modules/format/date/month.js

@@ -1,13 +1,12 @@
 import React from 'react'
-import t from '~t'
 import { parseDate } from './parse'
 import dateFnsFormat from 'date-fns/format'
 
 let _format
 function getFormat() {
     if (!_format)
         _format = new Intl.DateTimeFormat(
-            t.currentLang,
+            undefined,
             {
                 year: 'numeric',
                 month: 'long',

src/modules/format/date/numeric.js

@@ -0,0 +1,39 @@
+import React from 'react'
+import { parseDate } from './parse'
+import dateFnsFormat from 'date-fns/format'
+
+let _format
+function getFormat() {
+    if (!_format)
+        _format = new Intl.DateTimeFormat(
+            undefined,
+            {
+                year: 'numeric',
+                month: 'numeric',
+                day: 'numeric',
+            }
+        ).format
+
+    return _format
+}
+
+export const numericDate = (original) => {
+    let d
+    try{ d = parseDate(original) } catch(e){}
+
+    try{
+        return getFormat()(d)
+    }catch(e){}
+
+    try{
+        return dateFnsFormat(d, 'P')
+    }catch(e){}
+
+    return ''
+}
+
+export const NumericDate = React.memo(
+    function({ date }) {
+        return numericDate(date)
+    }
+)

src/modules/format/date/short.js

@@ -1,5 +1,4 @@
 import React from 'react'
-import t from '~t'
 import isToday from 'date-fns/isToday'
 import isThisYear from 'date-fns/isThisYear'
 import dateFnsFormat from 'date-fns/format'
@@ -17,7 +16,7 @@ function getFormat(type) {
             default:        params = { year: 'numeric', month: 'short', day: 'numeric' }; break;
         }
 
-        _formats[type] = new Intl.DateTimeFormat(t.currentLang, { hour12, ...params }).format
+        _formats[type] = new Intl.DateTimeFormat(undefined, { hour12, ...params }).format
     }
 
     return _formats[type]

src/modules/format/date/shortTime.js

@@ -1,13 +1,12 @@
 import React from 'react'
-import t from '~t'
 import { parseDate } from './parse'
 import dateFnsFormat from 'date-fns/format'
 
 let _format
 function getFormat() {
     if (!_format)
         _format = new Intl.DateTimeFormat(
-            t.currentLang,
+            undefined,
             {
                 hour12: new Date().toLocaleTimeString().toString().match(/am|pm/i) ? true : false,
                 year: 'numeric',

src/routes/extension/tabs/index.js

@@ -2,7 +2,7 @@ import React, { useState } from 'react'
 import { useParams } from 'react-router-dom'
 import Screen from '~co/screen/basic'
 import { Layout, Separator } from '~co/common/form'
-import { longDate } from '~modules/format/date'
+import { numericDate } from '~modules/format/date'
 
 import useTabs, { preload } from './useTabs'
 import useSubmit from './useSubmit'
@@ -19,7 +19,7 @@ export default function ExtensionTabsScreen() {
     const params = useParams()
     const [tabs, setTabs] = useTabs()
     const [collectionId, setCollectionId] = useState(params.collectionId)
-    const [tags, setTags] = useState(()=>[longDate(new Date()).replace(/,/g, ' ')])
+    const [tags, setTags] = useState(()=>[numericDate(new Date())])
     const [close, setClose] = useState(true)
     const {onSubmit, loading} = useSubmit({ tabs, collectionId, tags, close })