Merge pull request livecode#1186 from runrevsebastien/bugfix-13460

livecodesebastien · livecodesebastien · commit f008469a449d · 2014-09-17T15:50:33.000+01:00
[[ Bug 13460 ]] 'convert' output is incorrectly formatted
diff --git a/docs/notes/bugfix-13460.md b/docs/notes/bugfix-13460.md
@@ -0,0 +1 @@
+# 'convert' output is incorrectly formatted
diff --git a/engine/src/date.cpp b/engine/src/date.cpp
@@ -111,7 +111,8 @@ bool MCDateTimeInitialize()
 	g_basic_locale->abbrev_month_names[10]= MCSTR("Nov");
 	g_basic_locale->abbrev_month_names[11]= MCSTR("Dec");
 	
-	g_basic_locale->date_formats[0] = MCSTR("^%#m/%#d/%#y");
+    // SN-2014-09-17: [[ Bug 13460 ]] No hashtag for the year
+	g_basic_locale->date_formats[0] = MCSTR("^%#m/%#d/%y");
 	g_basic_locale->date_formats[1] = MCSTR("%a, %b %#d, %#Y");
 	g_basic_locale->date_formats[2] = MCSTR("%A, %B %#d, %#Y");
 	

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# 'convert' output is incorrectly formatted`