From 14ac0d457a35fe9c834981570f7e30bd0c2d7882 Mon Sep 17 00:00:00 2001
From: wkeese <bill@dojotoolkit.org>
Date: Tue, 23 Feb 2016 08:22:04 +0900
Subject: [PATCH] Fix paths in dojox/date modules so they load in RequireJS,
 fixes #18794.

---
 date/buddhist.js        | 2 +-
 date/buddhist/locale.js | 2 +-
 date/hebrew.js          | 2 +-
 date/hebrew/locale.js   | 2 +-
 date/hebrew/numerals.js | 2 +-
 date/islamic.js         | 2 +-
 date/islamic/locale.js  | 2 +-
 date/persian.js         | 2 +-
 date/persian/locale.js  | 2 +-
 date/relative.js        | 2 +-
 date/umalqura.js        | 2 +-
 date/umalqura/locale.js | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/date/buddhist.js b/date/buddhist.js
index f65a7c1c5a..b341935eb8 100644
--- a/date/buddhist.js
+++ b/date/buddhist.js
@@ -1,4 +1,4 @@
-define(["..", "dojo/_base/lang", "dojo/date", "./buddhist/Date"], function(dojox, lang, dd, BDate){
+define(["dojox/main", "dojo/_base/lang", "dojo/date", "./buddhist/Date"], function(dojox, lang, dd, BDate){
 	var dbuddhist = lang.getObject("date.buddhist", true, dojox);
 
 // Utility methods to do arithmetic calculations with buddhist.Dates
diff --git a/date/buddhist/locale.js b/date/buddhist/locale.js
index ae62740027..b3f954b308 100644
--- a/date/buddhist/locale.js
+++ b/date/buddhist/locale.js
@@ -1,4 +1,4 @@
-define(["../..", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "dojo/i18n!dojo/cldr/nls/buddhist"],
+define(["dojox/main", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "dojo/i18n!dojo/cldr/nls/buddhist"],
 	function(dojox, lang, arr, dd, i18n, regexp, string, BDate){
 
 	var blocale = lang.getObject("date.buddhist.locale", true, dojox);
diff --git a/date/hebrew.js b/date/hebrew.js
index a33e8c9dd5..52f729089e 100644
--- a/date/hebrew.js
+++ b/date/hebrew.js
@@ -1,4 +1,4 @@
-define(["..", "dojo/_base/lang", "dojo/date", "./hebrew/Date"], function(dojox, lang, dd, HDate){
+define(["dojox/main", "dojo/_base/lang", "dojo/date", "./hebrew/Date"], function(dojox, lang, dd, HDate){
 
 var dhebrew = lang.getObject("date.hebrew", true, dojox);
 
diff --git a/date/hebrew/locale.js b/date/hebrew/locale.js
index 58214b8a5a..66b869f302 100644
--- a/date/hebrew/locale.js
+++ b/date/hebrew/locale.js
@@ -1,4 +1,4 @@
-define(["../..", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "./numerals", "dojo/i18n!dojo/cldr/nls/hebrew"],
+define(["dojox/main", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "./numerals", "dojo/i18n!dojo/cldr/nls/hebrew"],
 	function(dojox, lang, arr, dd, i18n, regexp, string, HDate, numerals){
 
 	var hlocale = lang.getObject("date.hebrew.locale", true, dojox);
diff --git a/date/hebrew/numerals.js b/date/hebrew/numerals.js
index b03a2c8f4b..54990c167b 100644
--- a/date/hebrew/numerals.js
+++ b/date/hebrew/numerals.js
@@ -1,4 +1,4 @@
-define(["../..", "dojo/_base/lang", "dojo/_base/array"], function(dojox, lang, arr){
+define(["dojox/main", "dojo/_base/lang", "dojo/_base/array"], function(dojox, lang, arr){
 	var hnumerals = lang.getObject("date.hebrew.numerals", true, dojox);
 
 	//Conversion from "Hindi" numerals to Hebrew numerals and vice versa
diff --git a/date/islamic.js b/date/islamic.js
index b2404c3b5e..b1d3292ece 100644
--- a/date/islamic.js
+++ b/date/islamic.js
@@ -1,4 +1,4 @@
-define(["..", "dojo/_base/lang", "dojo/date", "./islamic/Date"], function(dojox, lang, dd, IDate){
+define(["dojox/main", "dojo/_base/lang", "dojo/date", "./islamic/Date"], function(dojox, lang, dd, IDate){
 
 var dislamic = lang.getObject("date.islamic", true, dojox);
 
diff --git a/date/islamic/locale.js b/date/islamic/locale.js
index b36f4e3808..106f95b764 100644
--- a/date/islamic/locale.js
+++ b/date/islamic/locale.js
@@ -1,4 +1,4 @@
-define(["../..", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "dojo/i18n!dojo/cldr/nls/islamic"],
+define(["dojox/main", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "dojo/i18n!dojo/cldr/nls/islamic"],
        function(dojox, lang, arr, dd, i18n, regexp, string, IDate, bundle){
 
 	var ilocale = lang.getObject("date.islamic.locale", true, dojox);
diff --git a/date/persian.js b/date/persian.js
index 1e535629b0..53b6771cbf 100644
--- a/date/persian.js
+++ b/date/persian.js
@@ -1,4 +1,4 @@
-define("dojox/date/persian", ["..", "dojo/_base/lang", "dojo/date", "./persian/Date"], function(dojox, lang, dd, IDate){
+define(["dojox/main", "dojo/_base/lang", "dojo/date", "./persian/Date"], function(dojox, lang, dd, IDate){
 
 var dpersian = lang.getObject("date.persian", true, dojox);
 
diff --git a/date/persian/locale.js b/date/persian/locale.js
index e7c996c2c6..7fb3256abb 100644
--- a/date/persian/locale.js
+++ b/date/persian/locale.js
@@ -1,4 +1,4 @@
-define(["../..", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "dojo/i18n!dojo/cldr/nls/persian"],
+define(["dojox/main", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "dojo/i18n!dojo/cldr/nls/persian"],
        function(dojox, lang, arr, dd, i18n, regexp, string, IDate, bundle){
 
 	var ilocale = lang.getObject("date.persian.locale", true, dojox);
diff --git a/date/relative.js b/date/relative.js
index 62f54bda0a..1bae7200bc 100644
--- a/date/relative.js
+++ b/date/relative.js
@@ -1,4 +1,4 @@
-define(["..", "dojo/_base/lang", "dojo/date/locale", "dojo/i18n"], function(dojox, lang, ddl, i18n){
+define(["dojox/main", "dojo/_base/lang", "dojo/date/locale", "dojo/i18n"], function(dojox, lang, ddl, i18n){
 
 var drelative = lang.getObject("date.relative", true, dojox);
 
diff --git a/date/umalqura.js b/date/umalqura.js
index d28d4631a9..d360d47ba6 100644
--- a/date/umalqura.js
+++ b/date/umalqura.js
@@ -1,4 +1,4 @@
-define(["..", "dojo/_base/lang", "dojo/date", "./umalqura/Date"], function(dojox, lang, dd, IDate){
+define(["dojox/main", "dojo/_base/lang", "dojo/date", "./umalqura/Date"], function(dojox, lang, dd, IDate){
 
 var dumalqura = lang.getObject("date.umalqura", true, dojox);
 
diff --git a/date/umalqura/locale.js b/date/umalqura/locale.js
index d606a46e2e..391092bbdf 100644
--- a/date/umalqura/locale.js
+++ b/date/umalqura/locale.js
@@ -1,4 +1,4 @@
-define(["../..", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "dojo/i18n!dojo/cldr/nls/islamic"],
+define(["dojox/main", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "dojo/i18n!dojo/cldr/nls/islamic"],
        function (dojox, lang, arr, dd, i18n, regexp, string, IDate, bundle) {
 
            var ilocale = lang.getObject("date.umalqura.locale", true, dojox);