Merge branch '5.0' into 5.1

silverstripe · Oct 15, 2023 · b786042 · b786042
2 parents 7cb3de8 + 879de87
commit b786042
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,8 @@
  },
  "extra": {
  "expose": [
- "client/dist"
+ "client/dist",
+ "client/lang"
  ]
  },
  "minimum-stability": "dev",

diff --git a/src/Method.php b/src/Method.php
@@ -74,6 +74,7 @@ public function getThumbnail(): string
  */
  public function applyRequirements(): void
  {
+ Requirements::add_i18n_javascript('silverstripe/webauthn-authenticator: client/lang');
  Requirements::javascript('silverstripe/webauthn-authenticator: client/dist/js/bundle.js');
  Requirements::css('silverstripe/webauthn-authenticator: client/dist/styles/bundle.css');
  }

diff --git a/tests/MethodTest.php b/tests/MethodTest.php
@@ -42,7 +42,7 @@ public function testApplyRequirements()
  $method = new Method();
  $method->applyRequirements();
 
- $this->assertCount(1, Requirements::backend()->getJavascript());
+ $this->assertcount(2, Requirements::backend()->getJavascript());
  $this->assertCount(1, Requirements::backend()->getCSS());
  }