From 5ed777834d86329a5e549baca91eb5f0f960b2ff Mon Sep 17 00:00:00 2001 From: Dawa Ometto Date: Thu, 22 Sep 2022 01:45:32 +0200 Subject: [PATCH] Fix locale location --- .github/workflows/docker-test.yml | 4 ++-- lib/gollum.rb | 2 +- test/integration/test_localization.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index 7c73400a..75e1ace3 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -47,8 +47,8 @@ jobs: sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional - name: Run gollum from Docker run: | - git clone test/examples/lotr.git lotr.git - RUNNER_TRACKING_ID="" docker run --rm -p 4567:4567 -v lotr.git:/wiki -e CI=true ${{ env.CI_IMAGE }} & + git clone test/examples/lotr.git /tmp/lotr.git + RUNNER_TRACKING_ID="" docker run --rm -p 4567:4567 -v /tmp/lotr.git:/wiki -e CI=true ${{ env.CI_IMAGE }} --mathjax --mermaid & sleep 10 netstat -lt - name: Run capybara tests against Dockerized instance diff --git a/lib/gollum.rb b/lib/gollum.rb index 1e4bfa7e..37dc6cea 100644 --- a/lib/gollum.rb +++ b/lib/gollum.rb @@ -17,7 +17,7 @@ module Gollum KEYBINDINGS = ['default', 'vim', 'emacs'] ::I18n.available_locales = [:en] - ::I18n.load_path = Dir[::File.expand_path("lib/gollum/locales") + "/*.yml"] + ::I18n.load_path = Dir[::File.expand_path("../gollum/locales", __FILE__) + "/*.yml"] def self.assets_path ::File.expand_path('gollum/public', ::File.dirname(__FILE__)) diff --git a/test/integration/test_localization.rb b/test/integration/test_localization.rb index 814ef8ed..a6ac7fe8 100644 --- a/test/integration/test_localization.rb +++ b/test/integration/test_localization.rb @@ -19,7 +19,7 @@ context 'Localized frontend' do fill_in('Search', with: 'something-to-return-no-results') .native .send_keys(:return) - + puts "DEBUG: #{page.text}" assert_includes page.text, 'Search results for something-to-return-no-results' assert_includes page.text,