Merge branch 'feature/timeago-locales' into 'develop'
Revert to English timeago for latin script languages. See merge request pleroma/pleroma-fe!144
This commit is contained in:
		
						commit
						9913601080
					
				
					 7 changed files with 1 additions and 67 deletions
				
			
		| 
						 | 
				
			
			@ -30,15 +30,9 @@ const currentLocale = (window.navigator.language || 'en').split('-')[0]
 | 
			
		|||
Vue.use(Vuex)
 | 
			
		||||
Vue.use(VueRouter)
 | 
			
		||||
Vue.use(VueTimeago, {
 | 
			
		||||
  locale: currentLocale,
 | 
			
		||||
  locale: currentLocale === 'ja' ? 'ja' : 'en',
 | 
			
		||||
  locales: {
 | 
			
		||||
    'en': require('../static/timeago-en.json'),
 | 
			
		||||
    'fi': require('../static/timeago-fi.json'),
 | 
			
		||||
    'de': require('../static/timeago-de.json'),
 | 
			
		||||
    'et': require('../static/timeago-et.json'),
 | 
			
		||||
    'hu': require('../static/timeago-hu.json'),
 | 
			
		||||
    'it': require('../static/timeago-it.json'),
 | 
			
		||||
    'fr': require('../static/timeago-fr.json'),
 | 
			
		||||
    'ja': require('../static/timeago-ja.json')
 | 
			
		||||
  }
 | 
			
		||||
})
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,10 +0,0 @@
 | 
			
		|||
[
 | 
			
		||||
  "jetzt gerade",
 | 
			
		||||
  ["vor %s Sekunde", "vor %s Sekunden"],
 | 
			
		||||
  ["vor %s Minute", "vor %s Minuten"],
 | 
			
		||||
  ["vor %s Stunde", "vor %s Stunden"],
 | 
			
		||||
  ["vor %s Tag", "vor %s Tagen"],
 | 
			
		||||
  ["vor %s Woche", "vor %s Wochen"],
 | 
			
		||||
  ["vor %s Monat", "vor %s Monaten"],
 | 
			
		||||
  ["vor %s Jahr", "vor %s Jahren"]
 | 
			
		||||
]
 | 
			
		||||
| 
						 | 
				
			
			@ -1,10 +0,0 @@
 | 
			
		|||
[
 | 
			
		||||
  "praegu",
 | 
			
		||||
  ["%s sekund tagasi", "%s sekundit tagasi"],
 | 
			
		||||
  ["%s minut tagasi", "%s minutit tagasi"],
 | 
			
		||||
  ["%s tund tagasi", "%s tundi tagasi"],
 | 
			
		||||
  ["%s päev tagasi", "%s päeva tagasi"],
 | 
			
		||||
  ["%s nädal tagasi", "%s nädalat tagasi"],
 | 
			
		||||
  ["%s kuu tagasi", "%s kuud tagasi"],
 | 
			
		||||
  ["%s aasta tagasi", "%s aastat tagasi"]
 | 
			
		||||
]
 | 
			
		||||
| 
						 | 
				
			
			@ -1,10 +0,0 @@
 | 
			
		|||
[
 | 
			
		||||
  "juuri nyt",
 | 
			
		||||
  ["%s sekunti sitten", "%s sekuntia sitten"],
 | 
			
		||||
  ["%s minuutti sitten", "%s minuuttia sitten"],
 | 
			
		||||
  ["%s tunti sitten", "%s tuntia sitten"],
 | 
			
		||||
  ["%s päivä sitten", "%s päivää sitten"],
 | 
			
		||||
  ["%s viikko sitten", "%s viikkoa sitten"],
 | 
			
		||||
  ["%s kuukausi sitten", "%s kuukautta sitten"],
 | 
			
		||||
  ["%s vuosi sitten", "%s vuotta sitten"]
 | 
			
		||||
]
 | 
			
		||||
| 
						 | 
				
			
			@ -1,10 +0,0 @@
 | 
			
		|||
[
 | 
			
		||||
  "à l'instant",
 | 
			
		||||
  ["il y a %s seconde", "il y a %s secondes"],
 | 
			
		||||
  ["il y a %s minute",  "il y a %s minutes"],
 | 
			
		||||
  ["il y a %s heure",   "il y a %s heures"],
 | 
			
		||||
  ["il y a %s jour",    "il y a %s jours"],
 | 
			
		||||
  ["il y a %s semaine", "il y a %s semaines"],
 | 
			
		||||
  ["il y a %s mois",    "il y a %s mois"],
 | 
			
		||||
  ["il y a %s an",      "il y a %s ans"]
 | 
			
		||||
]
 | 
			
		||||
| 
						 | 
				
			
			@ -1,10 +0,0 @@
 | 
			
		|||
[
 | 
			
		||||
  "pont most",
 | 
			
		||||
  "%s másodperce",
 | 
			
		||||
  "%s perce",
 | 
			
		||||
  "%s órája",
 | 
			
		||||
  "%s napja",
 | 
			
		||||
  "%s hete",
 | 
			
		||||
  "%s hónapja",
 | 
			
		||||
  "%s éve"
 | 
			
		||||
]
 | 
			
		||||
| 
						 | 
				
			
			@ -1,10 +0,0 @@
 | 
			
		|||
[
 | 
			
		||||
  "adesso",
 | 
			
		||||
  ["%s secondo fa", "%s secondi fa"],
 | 
			
		||||
  ["%s minuto fa", "%s minuti fa"],
 | 
			
		||||
  ["%s ora fa", "%s ore fa"],
 | 
			
		||||
  ["%s giorno fa", "%s giorni fa"],
 | 
			
		||||
  ["%s settimana fa", "%s settimane fa"],
 | 
			
		||||
  ["%s mese fa", "%s mesi fa"],
 | 
			
		||||
  ["%s anno fa", "%s anni fa"]
 | 
			
		||||
]
 | 
			
		||||
		Loading…
	
		Reference in a new issue