Merge branch 'development'

.gitignore

@@ -3,6 +3,7 @@ Thumbs.db
 .settings
 logs/*
 settings.xml
+.vscode/*
 .netbeans
 /bower_components/*
 /bower_components

.module.properties

@@ -1,3 +1,3 @@
 project.name=cbi18n
-project.version=1.3.2
+project.version=1.4.0
 module.name=cbi18n

.travis.yml

@@ -1,5 +1,7 @@
 language: java
 
+sudo: required
+
 notifications:
   slack:
     secure: FIHlTn/YO7Wgumm1uIqmoEsqjQA7fV0AE94Rjc5yKzM3AquQa8HicgDVVk0d2GrKRnl0xt3j4ZJV//VJyIjlCd/QVKuj48R2ChjEY2im3+99HFPafCUI5/S2uyowKU6mJTFonH9v6p41eqxdbiAxJdDGOT0V2Gpt3UBSNuHz8ED9/aIHqv+P7M+VD6Xd2XYwctPniWlaSWx57sWcnG/VkFG45qFQAyha64uxOOe4M3ZmG/n5FfauZ8cBVLiRKEIr+CyNhh1ujfzi7+4uzMlSNL5t/BbZamAQuZzqGzGQ9RVvIlyPgUGNJtDEE/hWS09aagXF5T6EMj00szizErh4J1/x4qZwml5+TcBN31E0QmAhCtZe85sr3tYgic+hEz9XX1yymQzf/C7n4to2yNvq0r4g51xDk8IuP95WEh7zaqLlvFZvBFgxpHZBMYlRvhytjOYDeIFRMcGwHZcXosaG2ejqDwcGq/LC4oeG4sSwmg9sdRrtcmcanrNqrBka86WYO6LntI3JdZ86/1ACEUHzhCCwvrKELc9Ji1xxGAgS7QKH+s2/hnJuiMyv73gOVLKYC+wPMLt+fvOmPLSEl+PJiAIlToBq1KUBg03RSQLfPOLD7OrJ8VvDZsEPwejqlGDyc4wRglS9OTi7SnN5LYHSDNDdGdREegWqq9qDHEYEVLI=
@@ -10,7 +12,6 @@ env:
   matrix:
     - [email protected]
     - ENGINE=lucee@5
-    - ENGINE=adobe@10
     - ENGINE=adobe@11
     - ENGINE=adobe@2016
 
@@ -19,10 +20,6 @@ branches:
   - development
   - master
 
-dist: trusty
-
-sudo: required
-
 before_install:
   # CommandBox Keys
   - sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622

apidocs/box.json

@@ -4,11 +4,9 @@
     "slug":"module-apidocs",
     "private":true,
     "dependencies":{
-        "docbox":"^2.0.7+00005"
-    },
-    "devDependencies":{
-
+        "docbox":"^2.2.1+27"
     },
+    "devDependencies":{},
     "installPaths":{
         "docbox":"docbox"
     }

box.json

@@ -8,12 +8,12 @@
         "workbench":"git+https://github.com/Ortus-Solutions/unified-workbench.git"
     },
     "devDependencies":{
-        "testbox":"^2.4.0+80"
+        "testbox":"^2.6.0+156"
     },
     "installPaths":{
         "coldbox":"coldbox",
-        "testbox":"testbox",
-        "workbench":"workbench"
+        "workbench":"workbench",
+        "testbox":"testbox"
     },
     "testbox":{
         "runner":"http://localhost:49616"

changelog.md

@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+## 1.4.0
+* Few docuementation fixes
+* Fix implementation of `getTZoffset()` thanks to Seb Duggan
+* CCM-47 Case sensitivity resolved for resource service thanks to @wpdebruin
+* Updated TestBox version
+
 ## 1.3.2
 * Unified workbench
 * Encapsulation of module bundle resources

modules/cbi18n/box.json

@@ -20,7 +20,7 @@
 	],
 	"engines"	: [
 		{ "type" : "lucee", "version" : ">4.5" },
-		{ "type" : "adobe", "version" : ">10" }
+		{ "type" : "adobe", "version" : ">11" }
 	],
 	"ignore":[
         "**/.*",

modules/cbi18n/models/ResourceService.cfc

@@ -359,7 +359,7 @@ Inspired by Paul Hastings
 	    	// Struct substitutions by key
 	    	else if( isStruct( arguments.substituteValues ) ){
 	    		for( thisKey in arguments.substituteValues ){
-	    			tmpStr = replace( tmpStr, "{#lcase( thisKey )#}", arguments.substituteValues[ lcase( thisKey ) ], "ALL" );
+	    			tmpStr = replaceNoCase( tmpStr, "{#lcase( thisKey )#}", arguments.substituteValues[ lcase( thisKey ) ], "ALL" );
 	    		}
 	    		return tmpStr;
 	    	}
@@ -434,4 +434,4 @@ Inspired by Paul Hastings
 
 <!------------------------------------------- PRIVATE ------------------------------------------->
 
-</cfcomponent>
+</cfcomponent>

modules/cbi18n/models/i18n.cfc

@@ -686,13 +686,13 @@ www.ortussolutions.com
 	<!--- ************************************************************* --->
 
 	<!--- ************************************************************* --->
-	<cffunction name="getTZOffset" output="false" access="public" hint="returns offset in hours">
+	<cffunction name="getTZOffset" output="false" access="public" hint="returns the offset in hours for the given datetime in the specified timezone">
 		<!--- ************************************************************* --->
-		<cfargument name="thisOffset" required="yes" type="numeric">
+		<cfargument name="thisDate" required="yes" type="date">
 		<cfargument name="thisTZ" required="no" default="#instance.timeZone.getDefault().getID()#">
 		<!--- ************************************************************* --->
 	       <cfset var tZ=instance.timeZone.getTimeZone(arguments.thisTZ)>
-	       <cfreturn tZ.getOffset(arguments.thisOffset)/3600000> <!--- return hours --->
+	       <cfreturn tZ.getOffset(arguments.thisDate)/3600000> <!--- return hours --->
 	</cffunction>
 	<!--- ************************************************************* --->
 

readme.md

@@ -4,19 +4,18 @@
 This module will enhance your ColdBox applications with i18n capabilities,
 resource bundles and localization.
 
-##LICENSE
+## LICENSE
 Apache License, Version 2.0.
 
-##IMPORTANT LINKS
+## IMPORTANT LINKS
 - Documentation: https://github.com/coldbox-modules/cbox-i18n/wiki
 - Source: https://github.com/coldbox-modules/cbox-i18n
 - ForgeBox: https://forgebox.io/view/i18n
 - [Changelog](changelog.md)
 
-##SYSTEM REQUIREMENTS
+## SYSTEM REQUIREMENTS
 - Lucee 4.5+
-- Railo 4+ (Deprecated)
-- ColdFusion 9+
+- ColdFusion 11+
 
 ## INSTRUCTIONS
 
@@ -98,7 +97,7 @@ You can read more about this module here: https://github.com/coldbox-modules/cbo
 Copyright Since 2005 ColdBox Framework by Luis Majano and Ortus Solutions, Corp
 www.coldbox.org | www.luismajano.com | www.ortussolutions.com
 ********************************************************************************
-####HONOR GOES TO GOD ABOVE ALL
+#### HONOR GOES TO GOD ABOVE ALL
 Because of His grace, this project exists. If you don't like this, then don't read it, its not for you.
 
 >"Therefore being justified by faith, we have peace with God through our Lord Jesus Christ:
@@ -108,5 +107,5 @@ And patience, experience; and experience, hope:
 And hope maketh not ashamed; because the love of God is shed abroad in our hearts by the 
 Holy Ghost which is given unto us. ." Romans 5:5
 
-###THE DAILY BREAD
+### THE DAILY BREAD
  > "I am the way, and the truth, and the life; no one comes to the Father, but by me (JESUS)" Jn 14:1-12