Skip to content

Commit e28919b

Browse files
authored
AP-302: Fix missing translation and update README (#43)
* AP-302: Fix missing translation from login/logout links * Update README: latest docker compose commands; current Geoblacklight version * Add a comment to README
1 parent aaa8e9e commit e28919b

File tree

3 files changed

+26
-23
lines changed

3 files changed

+26
-23
lines changed

README.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
# Geodata
22

3-
Geodata web portal developed from Geoblacklight 4.1.0
3+
Geodata web portal developed from Geoblacklight 4.4.2
44
[Geodata@UCB](https://geodata.lib.berkeley.edu/)
55

66
## Docker
77

88

99
```sh
1010
# Build container images
11-
docker-compose build --pull --force-rm
11+
docker compose build --pull
12+
# or
13+
docker compose build --pull --no-cache
1214

1315
# Start the stack in the background
14-
docker-compose up --d
16+
docker compose up --d
1517

1618
# Run setup tasks (create databases, compile assets, etc.)
17-
docker-compose run --rm --entrypoint=setup app
19+
docker compose run --rm --entrypoint=setup app
1820
```
1921

2022
### Accessing Services
@@ -42,26 +44,26 @@ If you're curious, the code that does this is in `config/application.rb`.
4244
View logs:
4345

4446
```sh
45-
docker-compose logs -f # tail all logs
46-
docker-compose logs -f app # tail just the "app" service's logs (etc.)
47+
docker compose logs -f # tail all logs
48+
docker compose logs -f app # tail just the "app" service's logs (etc.)
4749
```
4850

4951
Shell into a container:
5052

5153
```sh
52-
docker-compose run --rm --entrypoint=ash app
54+
docker compose exec app bash
5355
```
5456

5557
Open a Rails console:
5658

5759
```sh
58-
docker-compose run --rm app console
60+
docker compose exec app rails console
5961
```
6062

6163
Stop services and clean up volumes:
6264

6365
```sh
64-
docker-compose down -v
66+
docker compose down -v
6567
```
6668

6769

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<div class="navbar-right">
2-
<ul class="nav navbar-nav">
3-
<% if signed_in? %>
4-
<li>
5-
<%= link_to t('logout'), destroy_user_session_path %>
6-
</li>
7-
<% else %>
8-
<li>
9-
<%= link_to t('login'), user_calnet_omniauth_authorize_path, method: 'post'%>
10-
</li>
11-
<% end %>
12-
</ul>
13-
</div>
2+
<ul class="nav navbar-nav">
3+
<% if signed_in? %>
4+
<li>
5+
<%= link_to t('links.logout'), destroy_user_session_path %>
6+
</li>
7+
<% else %>
8+
<li>
9+
<%= link_to t('links.login'), user_calnet_omniauth_authorize_path, method: 'post'%>
10+
</li>
11+
<% end %>
12+
</ul>
13+
</div>

config/locales/geodata.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
en:
22
blacklight:
33
application_name: 'UCB GeoData'
4-
login: 'Login'
5-
logout: 'Logout'
4+
links:
5+
login: 'Login'
6+
logout: 'Logout'

0 commit comments

Comments
 (0)