jenkins-bot has submitted this change and it was merged.

Change subject: [time.js/DataValues] Change calendar IDs to match Denny's 
guidelines
......................................................................


[time.js/DataValues] Change calendar IDs to match Denny's guidelines

NOTE: This will break existing time values used in Wikibase Snaks. The UI will 
not be able to
      initialize without having I4f9215a merged into the Wikibase extension 
first.

Change-Id: I3743781c874cb332a002b9c4c40dc9db9f680cdd
---
M DataValues/resources/time.js/src/time.Time.js
M DataValues/resources/values/TimeValue.js
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/DataValues/resources/time.js/src/time.Time.js 
b/DataValues/resources/time.js/src/time.Time.js
index afacc45..f3ef2af 100644
--- a/DataValues/resources/time.js/src/time.Time.js
+++ b/DataValues/resources/time.js/src/time.Time.js
@@ -141,9 +141,9 @@
 
                this.calendarURI = function() {
                        if( calendarname === Time.CALENDAR.GREGORIAN ) {
-                               return 'http://wikidata.org/id/Q1985727';
+                               return 
'http://www.wikidata.org/entity/Q1985727';
                        } else if( calendarname === Time.CALENDAR.JULIAN ) {
-                               return 'http://wikidata.org/id/Q1985786';
+                               return 
'http://www.wikidata.org/entity/Q1985786';
                        }
                };
 
diff --git a/DataValues/resources/values/TimeValue.js 
b/DataValues/resources/values/TimeValue.js
index 8da745e..b747639 100644
--- a/DataValues/resources/values/TimeValue.js
+++ b/DataValues/resources/values/TimeValue.js
@@ -103,11 +103,11 @@
                // NOTE: Having the calendar model as url to Wikidata was a 
specified data model requirement.
 
                // Time instance should be defined as Gregorian:
-               if( json.calendarmodel === 'http://wikidata.org/id/Q1985727' ) {
+               if( json.calendarmodel === 
'http://www.wikidata.org/entity/Q1985727' ) {
                        finalTime = gregorianTime;
                }
                // Time instance should be defined as Julian:
-               else if( json.calendarmodel === 
'http://wikidata.org/id/Q1985786' ) {
+               else if( json.calendarmodel === 
'http://www.wikidata.org/entity/Q1985786' ) {
                        // Since the data value saves the time as Gregorian, we 
first have to transform that
                        // back into Julian.
                        // NOTE: As of May 15 2013 we decided that this is 
nonsense and that we should always

-- 
To view, visit https://gerrit.wikimedia.org/r/64546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3743781c874cb332a002b9c4c40dc9db9f680cdd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: master
Gerrit-Owner: Daniel Werner <daniel.wer...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to