Use CC 3.0 licenses explictly

yuvipanda · yuvipanda · commit 0972ba6422cf · 2013-08-19T01:00:32.000+08:00
Bug: 52967
Change-Id: Ic4fee9a2dc2fd5571908f200431599c6047fb9c5
diff --git a/commons/src/main/java/org/wikimedia/commons/Utils.java b/commons/src/main/java/org/wikimedia/commons/Utils.java
@@ -143,11 +143,11 @@ public static String capitalize(String string) {
 
     public static String licenseTemplateFor(String license) {
         if(license.equals(Prefs.Licenses.CC_BY)) {
-            return "{{self|cc-by}}";
+            return "{{self|cc-by-3.0}}";
         } else if(license.equals(Prefs.Licenses.CC_BY_SA)) {
-            return "{{self|cc-by-sa}}";
+            return "{{self|cc-by-sa-3.0}}";
         } else if(license.equals(Prefs.Licenses.CC0)) {
-            return "{{self|cc0}}";
+            return "{{self|cc-zero}}";
         }
         throw new RuntimeException("Unrecognized license value");
     }

Original file line number	Diff line number	Diff line change
`@@ -143,11 +143,11 @@ public static String capitalize(String string) {`
`143`	`143`
`144`	`144`	`public static String licenseTemplateFor(String license) {`
`145`	`145`	`if(license.equals(Prefs.Licenses.CC_BY)) {`
`146`		`- return "{{self\|cc-by}}";`
	`146`	`+ return "{{self\|cc-by-3.0}}";`
`147`	`147`	`} else if(license.equals(Prefs.Licenses.CC_BY_SA)) {`
`148`		`- return "{{self\|cc-by-sa}}";`
	`148`	`+ return "{{self\|cc-by-sa-3.0}}";`
`149`	`149`	`} else if(license.equals(Prefs.Licenses.CC0)) {`
`150`		`- return "{{self\|cc0}}";`
	`150`	`+ return "{{self\|cc-zero}}";`
`151`	`151`	`}`
`152`	`152`	`throw new RuntimeException("Unrecognized license value");`
`153`	`153`	`}`