Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
lmajano committed Nov 16, 2022
2 parents a44de56 + deccb96 commit 1572e66
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion box.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name":"ColdBox i18n and Localization",
"author":"Ortus Solutions <[email protected]>",
"version":"3.1.0",
"version":"3.2.0",
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbi18n/@build.version@/[email protected]@.zip",
"slug":"cbi18n",
"type":"modules",
Expand Down
10 changes: 9 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

----

## [3.0.0] => 2022-NOV-15
## [3.2.0] => 2022-NOV-16

### Added

* Updated to use latest cb7 `announce()`

----

## [3.1.0] => 2022-NOV-15

### Added

Expand Down
4 changes: 2 additions & 2 deletions models/ResourceService.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ component singleton accessors="true" {

// Check if resource does NOT exists?
if ( !structKeyExists( thisBundle, arguments.resource ) ) {
variables.interceptorService.processState(
variables.interceptorService.announce(
"onUnknownTranslation",
{
resource : arguments.resource,
Expand Down Expand Up @@ -587,7 +587,7 @@ component singleton accessors="true" {
/**
* flatten a struct, so we can use keys in format 'main.sub1.sub2.resource'.
*
* @originalStruct
* @originalStruct
* @flattenedStruct necessary for recursion
* @prefix_string necessary for processing, so key kan be prepended with parent name
*
Expand Down

0 comments on commit 1572e66

Please sign in to comment.