Skip to content

Commit

Permalink
Release 1.16.0 (#605)
Browse files Browse the repository at this point in the history
* db/seeds.rb: Give restroom entries an edit_id (#567)

Only applies during development and testing
when we use the "db/export.csv" data.

Doesn't affect production, which uses the real data in its db.

* Explain how to run individual tests and access psql (#570)

Also, clarify that there are two containers, web and db,
rather than just one; these can be viewed using
docker ps

* Make filter with "focus" class more readable

* Remove unused li

* Allow dropdown menu text to wrap and fit within the dropdown

Add border bottom to give each menu item more separation

* yarn.lock: Update jquery (#587)

* Dockerfile: Update and streamline steps (#586)

Does effectively the same things as before,
but now in a simpler/faster way.

Some of the changes take inspiration from
@btyy77c's dockerAlpine branch:
https://github.com/btyy77c/refugerestrooms/blob/dockerAlpine/Dockerfile

The PhantomJS install is based on (mostly copy-pasted from)
@nkovacs' phantomjs image from Docker Hub:
https://github.com/nkovacs/selenium-standalone-phantomjs/blob/c5f6bba218472270/Dockerfile#L19-L22

* Dockerfile: Get latest Node.js in a major version (#589)

(Also installs Node.js in /usr/local/
instead of installing Node.js in the root directory.)

With this updated script, we specify just a major version
and the script picks the latest minor/patch version within that.

--

Nodejs.org does most of the work by maintaining the "latest-v[MAJOR]"
folders; We only need to parse the "SHASUMS256.txt" file from there,
and pick the "linux-x64" variant, which works with our Docker setup.

At this point we can use the known directory URL, plus the filename
extracted from "SHASUMS256.txt", and download with curl, or wget, etc.

(e.g. "curl -L https://nodejs.org/dist/latest-v10.x/node-v10.16.0-linux-x64.tar.xz -o nodejs.tar.xz")

--

There is no "latest-LTS" folder or similar, so automatically getting
the latest LTS version would be more difficult.

We could search "nodejs.org/dist/" for folders with
the name "latest-[LETTERS-ONLY-STRING]", which would be the folders
of all the LTS codenames. Among these, the one with
the alphabetically last name is the latest LTS.

This would work at least until around 2040, when they may have
to loop around and re-use some earlier letters (a, b, c, etc.)

* Update Node.js and Ruby dependencies (#590)

* yarn.lock: Update Node.js packages

* Gemfile.lock: Update gems

* Add Bugsnag to readme

To fufill the open source agreement, we have to link to bugsnag now in our readme.

* .travis.yml: Use minimal base image for Travis CI

We do all the setup/build steps inside a Docker container,
so we don't need ruby tools outside of Docker
(on the Travis CI virtual machine instances).

Should save about 20 seconds of Travis CI build time.

--

Inspired by @btyy77c who did this first at their dockerAlpine branch:
  - btyy77c@393cf46

Documentation at Travis re: minimal/generic images:
  - https://docs.travis-ci.com/user/languages/minimal-and-generic/

* docker-compose.yml: Use postgresql:alpine image

This (the Alpine Linux-based postgresql image) is a smaller image
than the debian-based postgresql image,
so it should be marginally faster to download.

Seems like a good idea in general,
to speed up build times (even outside of Travis CI).

Also should save some disk space for developers.

--

Inspired by the general concept of @btyy77c's dockerAlpine branch:
  - https://github.com/btyy77c/refugerestrooms/commits/dockerAlpine

Docker Hub documentation on the alpine vs debian postgres images:
  - https://hub.docker.com/_/postgres#image-variants

* layouts/_footer.html.haml: Remove tumblr link

* stylesheets/.../common: Remove tumblr icon stlye

* en/footer.en.yml: Remove string for tumblr blog

This isn't needed anymore,
since we have removed the tumblr link from the footer.

* removed tumblr from about page (#593)

I noticed we were removing tumblr, here's one more instance

* Create about.fil.yml (#465)

* Filipino Translation devise.fil.yml (#454)

* Create devise.fil.yml

* Update devise.fil.yml

* Update for devise.fil.yml @100% Translation

* Update and rename devise.fil.yml to devise.fl.yml

* Update and rename devise.fl.yml to devise.fil.yml

* 100% completed for restroom.fil.yml file  (#467)

* Create restroom.fil.yml

* Translations for EN to FIL Issue 451 (#556)

Translated files from EN to FIL #451

* config/locales/fil/: Remove tumblr

See #592 and #593

* Updated filipino translations

* switched sass-rails gem (#595)

* switched sass-rails gem (sass-rails --> sassc-rails)

* Changed the word `restroom` to `banyo` to be mroe understandable to most Filipinos

* Fixed some unnoticed words that needed some changes in translation

* additional translation changes

* config/application.rb: Add 'fil' locale (Filipino)

Enables translations as merged in #596

* .travis.yml: Set "dist" to "trusty" (#600)

Should allow our CI tests to pass
while we investigate test failures on xenial and newer.

* production.rb: Fix i18n.fallbacks deprecation warn

* config/application.rb: Add Tagalog (:tl) locale

* production.rb: I18n fallbacks for :tl --> :fil

We don't maintain separate translations for
"Tagalog" and Filipino, since they are arguably the same language.

However, Firefox only allows users to set "Tagalog" as preferred,
and Chrome only allows users to set "Filipino" as preferred.

To support both browsers, we must support both the "Tagalog"
and the "Filipino" locales.

(These locales use the "tl" and "fil" locale codes, respectively.)

* config/application.rb: Set default locale to "en"

* package.json: Update swagger to master with patch

* yarn.lock: Commit updated (indirect) dependencies

* yarn.lock: Update all packages

* Gemfile[.lock]: Update devise, simple_form

* yarn.lock: Upgrade swagger-ui's dependencies

* Ruby: Upgrade from 2.5.3 to 2.5.7

* Dockerfile: Work around an issue with phantomjs

When running the tests, cliver tries to check that PhantomJS's version
is within a certain range, by running "phantomjs --version".

The "phantomjs --version" command fails for some reason
on the new ruby:2.5.7-slim Docker base image.

Perhaps because the new Docker image is based on Debian 10 "Buster,"
whereas the old Docker image was based on Debian 9 "Stretch"?

This commit's workaround allows "phantomjs --version" to work again.
tkwidmer authored Oct 29, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 699d846 commit 8e091b6
Showing 34 changed files with 2,438 additions and 1,378 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.3
2.5.7
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
env:
global:
- CC_TEST_REPORTER_ID=c18df080592f9c99ca8080a6d5e052aa5fd3964044a0fe0b71e48f8e18998dc2
language: ruby
language: minimal
dist: trusty
services: docker
install:
- docker-compose build
43 changes: 37 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -13,20 +13,27 @@ _(Older Mac or Windows PC? See [instructions for Docker Toolbox](https://github.

_(Running Linux? See [instructions for Docker CE on Linux](https://github.com/RefugeRestrooms/refugerestrooms/wiki/How-to-use-Docker-CE-on-Linux-with-Refuge-Restrooms).)_

### 3 Build the Docker Container
Build the container from any [terminal](https://github.com/RefugeRestrooms/refugerestrooms/wiki/What-is-a-Terminal-(or-%22Terminal-Emulator%22)%3F-How-do-I-run-text-based-commands-on-my-computer%3F) program with:
### 3 Build the Docker Containers
Build the containers from any [terminal](https://github.com/RefugeRestrooms/refugerestrooms/wiki/What-is-a-Terminal-(or-%22Terminal-Emulator%22)%3F-How-do-I-run-text-based-commands-on-my-computer%3F) program with:
```
docker-compose build
```

### 4 Run the Docker Container
Optional: list the containers you just built:
```
docker ps
```

You should see two containers: refugerestrooms_web and postgres.

### 4 Run the Docker Containers

You can now run the app with:
```
docker-compose up
```

The container will be reachable at this address: `localhost:3000`
The web app will be reachable at this address: `localhost:3000`

_(Point your web browser at `localhost:3000` or `127.0.0.1:3000`, or even `[IP address of computer running the container]:3000` from any computer on the same LAN. The last method is useful for testing the app/site on smart phones and tablets.)_

@@ -38,16 +45,40 @@ If you need to run commands on the Docker container directly, run this:
```
docker-compose run web bash
```
_(This will give you a full interactive terminal session running on the Docker machine. You can (for example) run `bundle update` to update the Gems in the Gemfile to more recent versions.)_
_(This will give you a full interactive terminal session running on the Docker machine. For example, run `bundle update` to update the Gems in the Gemfile to more recent versions, or `rails console` to access web objects like `Restroom.first`.)_

Occasionally, you might need to rebuild the Docker machine so it picks up major updates (such as a new version of Ruby, or an updated Gemfile). To do so, run `docker-compose down` and `docker-compose build`.

If you want to access the postgres container to reach the psql command line do

```
docker-compose run db bash
psql -h refugerestrooms_db_1 -U postgres
```

or equivalently:
```
docker-compose run db psql -h refugerestrooms_db_1 -U postgres
```

### 6 Run the Tests
```
docker-compose run -e "RAILS_ENV=test" web rake db:test:prepare spec
docker-compose run -e "RAILS_ENV=test" web rake db:migrate:reset spec
```
_(If you want to know if your changes pass our automated testing, before even submitting your changes to RefugeRestrooms on Github, this will let you know.)_

If you want to run an individual spec, first log in to the container, then the spec. E.g.:
```
docker-compose run web bash
rspec spec/models/restroom_spec.rb
```

This is equivalent, but slower during a code-test-code-test development cycle:

```
docker-compose run web rspec spec/models/restroom_spec.rb
```

### 7 Shut down the Docker Container:
In another terminal window, run:
```
69 changes: 40 additions & 29 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,38 +1,49 @@
FROM ruby:2.5.3-slim
ENV PHANTOM_JS=2.1.1
FROM ruby:2.5.7-slim

# Add basic binaries
RUN apt-get update \
&& apt-get install -y bzip2 curl gnupg wget

# Add the apt repository for yarn
RUN curl -sS http://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
echo "deb http://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list

# Add the apt-repository for the latest node.js
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -

RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
RUN apt-get install build-essential chrpath libssl-dev libxft-dev -y && \
apt-get install libfreetype6 libfreetype6-dev -y && \
apt-get install libfontconfig1 libfontconfig1-dev -y && \
cd ~ && \
export PHANTOM_JS="phantomjs-2.1.1-linux-x86_64" && \
wget https://github.com/Medium/phantomjs/releases/download/v2.1.1/$PHANTOM_JS.tar.bz2 && \
tar xvjf $PHANTOM_JS.tar.bz2 && \
mv $PHANTOM_JS /usr/local/share && \
ln -sf /usr/local/share/$PHANTOM_JS/bin/phantomjs /usr/local/bin && \
apt-get install -y yarn

# Clean up the apt cache
RUN rm -rf /var/lib/apt/lists/*

&& apt-get install -y curl g++ gcc libfontconfig libpq-dev make patch xz-utils \
# Clean up the apt cache
&& rm -rf /var/lib/apt/lists/*

# Download, extract and install PhantomJS from archive hosted at bitbucket
RUN curl -L https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O \
# Extract and clean up the PhantomJS archive
&& tar xf phantomjs-2.1.1-linux-x86_64.tar.bz2 && rm phantomjs-2.1.1-linux-x86_64.tar.bz2 \
# Install PhantomJS binary to /usr/local/bin
&& mv phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin \
# Clean up extra (un-needed) PhantomJS files
&& rm -rf phantomjs-2.1.1-linux-x86_64/

# Work around an issue with running "phantomjs --version"
ENV OPENSSL_CONF=/etc/ssl/

# Specify a major version of Node.js to download and install
ENV NODEJS_MAJOR_VERSION=10

# Download and extract Node.js from archive supplied by nodejs.org
RUN curl -L https://nodejs.org/dist/latest-v$NODEJS_MAJOR_VERSION\.x/SHASUMS256.txt -O \
&& ARCHIVE_FILENAME=$(grep -o "node-*.*.*-linux-x64.tar.xz" SHASUMS256.txt) \
&& curl -L https://nodejs.org/dist/latest-v$NODEJS_MAJOR_VERSION.x/$ARCHIVE_FILENAME -o nodejs.tar.xz \
&& tar xf nodejs.tar.xz \
&& mv ./node-v*-linux-x64 /usr/local/nodejs \
# Clean up the Node.js archive and SHASUMS256.txt
&& rm nodejs.tar.xz SHASUMS256.txt

# Add Node.js binaries to PATH (includes Node and NPM, will include Yarn)
ENV PATH="/usr/local/nodejs/bin/:${PATH}"

# Install Yarn
RUN npm install -g yarn

# Make the "/refugerestrooms" folder, run all subsequent commands in that folder
RUN mkdir /refugerestrooms
WORKDIR /refugerestrooms

COPY Gemfile /refugerestrooms/Gemfile
COPY Gemfile.lock /refugerestrooms/Gemfile.lock
# Install Ruby gems with Bundler
COPY Gemfile Gemfile.lock /refugerestrooms/
RUN bundle install

# Install Node.js packages with Yarn
COPY package.json yarn.lock /refugerestrooms/
RUN yarn --pure-lockfile
RUN yarn install --pure-lockfile
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
ruby '2.5.3'
ruby '2.5.7'

gem 'rails', '5.2.2.1'

@@ -27,8 +27,8 @@ gem 'puma'
gem 'rack-cors', :require => 'rack/cors'
gem 'rack-jsonp'
gem 'rakismet'
gem 'sass-rails'
gem 'simple_form', '~> 4.0'
gem 'sassc-rails'
gem 'simple_form', '~> 5.0'
gem 'turbolinks'
gem 'uglifier', '>= 1.3.0'
gem 'webpacker', '~> 3.5'
168 changes: 84 additions & 84 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ GEM
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activeadmin (1.4.1)
activeadmin (1.4.3)
arbre (>= 1.1.1)
coffee-rails
formtastic (~> 3.1)
@@ -54,39 +54,40 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
arbre (1.1.1)
arbre (1.2.1)
activesupport (>= 3.0.0)
arel (9.0.0)
autoprefixer-rails (9.5.0)
autoprefixer-rails (9.6.1)
execjs
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
bcrypt (3.1.12)
bcrypt (3.1.13)
better_errors (2.4.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.3.2)
bootsnap (1.4.4)
msgpack (~> 1.0)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
bugsnag (6.8.0)
bugsnag (6.11.1)
concurrent-ruby (~> 1.0)
builder (3.2.3)
capybara (3.9.0)
capybara (3.28.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
xpath (~> 3.1)
regexp_parser (~> 1.5)
xpath (~> 3.2)
cliver (0.3.2)
coderay (1.1.2)
coercible (1.0.0)
@@ -99,13 +100,12 @@ GEM
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.5)
countries (2.1.4)
countries (3.0.0)
i18n_data (~> 0.8.0)
money (~> 6.9)
sixarm_ruby_unaccent (~> 1.1)
unicode_utils (~> 1.4)
country_select (3.1.1)
countries (~> 2.0)
country_select (4.0.0)
countries (~> 3.0)
sort_alphabetical (~> 1.0)
crack (0.4.3)
safe_yaml (~> 1.0.0)
@@ -114,10 +114,10 @@ GEM
debug_inspector (0.0.3)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devise (4.6.1)
devise (4.7.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
diff-lcs (1.3)
@@ -126,14 +126,14 @@ GEM
dotenv (= 2.2.2)
railties (>= 3.2, < 6.0)
equalizer (0.0.11)
erubi (1.8.0)
erubi (1.9.0)
execjs (2.7.0)
factory_bot (4.8.2)
activesupport (>= 3.0.0)
factory_bot_rails (4.8.2)
factory_bot (~> 4.8.2)
railties (>= 3.0.0)
ffi (1.9.25)
ffi (1.11.1)
formtastic (3.1.5)
actionpack (>= 3.2.13)
formtastic_i18n (0.6.0)
@@ -150,32 +150,31 @@ GEM
grape-kaminari (0.1.9)
grape
kaminari
grape-swagger (0.31.0)
grape-swagger (0.33.0)
grape (>= 0.16.2)
haml (5.0.4)
haml (5.1.2)
temple (>= 0.8.0)
tilt
has_scope (0.7.2)
actionpack (>= 4.1)
activesupport (>= 4.1)
hashdiff (0.3.7)
hashdiff (1.0.0)
high_voltage (3.0.0)
http_accept_language (2.1.1)
i18n (1.6.0)
i18n (1.7.0)
concurrent-ruby (~> 1.0)
i18n-debug (1.1.1)
i18n-debug (1.2.0)
i18n (< 2)
i18n_data (0.8.0)
ice_nine (0.11.2)
inherited_resources (1.9.0)
actionpack (>= 4.2, < 5.3)
inherited_resources (1.11.0)
actionpack (>= 5.0, < 6.1)
has_scope (~> 0.6)
railties (>= 4.2, < 5.3)
responders
jbuilder (2.7.0)
railties (>= 5.0, < 6.1)
responders (>= 2, < 4)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.3)
jquery-rails (4.3.5)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
@@ -198,50 +197,50 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.3)
loofah (2.3.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
mail_form (1.7.1)
actionmailer (>= 3.2, < 6)
activemodel (>= 3.2, < 6)
mail_form (1.8.0)
actionmailer (>= 5.0)
activemodel (>= 5.0)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.2)
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
money (6.13.0)
i18n (>= 0.6.4, <= 2)
msgpack (1.2.4)
minitest (5.12.2)
msgpack (1.3.1)
multi_json (1.13.1)
mustermann (1.0.3)
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
nio4r (2.3.1)
nokogiri (1.10.1)
nio4r (2.4.0)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
pg (1.1.3)
pg_search (2.1.2)
pg (1.1.4)
pg_search (2.3.0)
activerecord (>= 4.2)
activesupport (>= 4.2)
arel (>= 6)
poltergeist (1.18.1)
capybara (>= 2.1, < 4)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
pry (0.11.3)
polyamorous (2.3.0)
activerecord (>= 5.0)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.6)
public_suffix (3.1.1)
puma (4.1.0)
nio4r (~> 2.0)
rack (2.0.7)
rack-accept (0.4.5)
rack (>= 0.4)
rack-cors (1.0.2)
rack-cors (1.0.3)
rack-jsonp (1.3.1)
rack
rack-proxy (0.6.5)
@@ -264,64 +263,65 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.2.2.1)
actionpack (= 5.2.2.1)
activesupport (= 5.2.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.2)
rake (13.0.0)
rakismet (1.5.4)
ransack (2.1.1)
ransack (2.3.0)
actionpack (>= 5.0)
activerecord (>= 5.0)
activesupport (>= 5.0)
i18n
polyamorous (= 2.3.0)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rdoc (6.0.4)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
rspec-core (3.8.0)
rb-inotify (0.10.0)
ffi (~> 1.0)
rdoc (6.1.1)
regexp_parser (1.6.0)
responders (3.0.0)
actionpack (>= 5.0)
railties (>= 5.0)
rspec-core (3.8.2)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.1)
rspec-expectations (3.8.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
rspec-mocks (3.8.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-rails (3.8.0)
rspec-rails (3.8.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rspec-support (3.8.2)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.6.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sassc (2.0.1)
sassc (2.1.0)
ffi (~> 1.9)
rake
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
sdoc (1.0.0)
rdoc (>= 5.0)
simple_form (4.0.1)
simple_form (5.0.1)
actionpack (>= 5.0)
activemodel (>= 5.0)
simplecov (0.7.1)
@@ -338,16 +338,16 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
temple (0.8.0)
temple (0.8.1)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.8)
tilt (2.0.9)
turbolinks (5.2.0)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.19)
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
unicode_utils (1.4.0)
virtus (1.0.5)
@@ -361,14 +361,14 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
webpacker (3.5.5)
webpacker (3.6.0)
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
websocket-driver (0.7.0)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xpath (3.1.0)
websocket-extensions (0.1.4)
xpath (3.2.0)
nokogiri (~> 1.8)

PLATFORMS
@@ -411,9 +411,9 @@ DEPENDENCIES
rails (= 5.2.2.1)
rakismet
rspec-rails
sass-rails
sassc-rails
sdoc
simple_form (~> 4.0)
simple_form (~> 5.0)
simplecov (~> 0.7.1)
turbolinks
tzinfo-data
@@ -422,7 +422,7 @@ DEPENDENCIES
webpacker (~> 3.5)

RUBY VERSION
ruby 2.5.3p105
ruby 2.5.7p206

BUNDLED WITH
1.17.3
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -6,6 +6,12 @@ Code Climate: [![Maintainability](https://api.codeclimate.com/v1/badges/a641d46a


Waffle.io: [![Stories in Ready](https://badge.waffle.io/RefugeRestrooms/refugerestrooms.png?label=ready)](https://waffle.io/RefugeRestrooms/refugerestrooms)

Bugsnag Open Source Bug Tracking:
[Bugsnag](https://www.bugsnag.com)
<br>
<img src="https://global-uploads.webflow.com/5c741219fd0819540590e785/5c741219fd0819856890e790_asset%2039.svg" width="250" />

# REFUGE restrooms

Providing safe restroom access to transgender, intersex, and gender nonconforming individuals.
@@ -29,7 +35,7 @@ Please also read our [Code of Conduct](https://github.com/RefugeRestrooms/refuge

## Tech

* Ruby Version - ruby-2.5.3
* Ruby Version - ruby-2.5.7
* Ruby on Rails
* RSpec
* Javascript
3 changes: 0 additions & 3 deletions app/assets/stylesheets/components/common.scss
Original file line number Diff line number Diff line change
@@ -141,9 +141,6 @@ footer {
&.fa-facebook-square:hover {
color: #3B5998;
}
&.fa-tumblr-square:hover {
color: #36465D;
}
&.fa-envelope:hover {
color: #BE1E2D;
}
10 changes: 10 additions & 0 deletions app/assets/stylesheets/components/nav.scss
Original file line number Diff line number Diff line change
@@ -42,4 +42,14 @@
cursor: pointer;
top: 2px
}

.dropdown-menu > li {
&:not(:last-child) {
border-bottom: 1px solid $light-gray;
}

> a {
white-space: normal;
}
}
}
4 changes: 4 additions & 0 deletions app/assets/stylesheets/restrooms/main.scss
Original file line number Diff line number Diff line change
@@ -125,6 +125,10 @@
overflow: hidden;
margin: 8px;
}

&.focus {
color: white;
}
}
.filter i.fa{
font-size: 22px;
1 change: 1 addition & 0 deletions app/assets/stylesheets/sass/_variables.scss
Original file line number Diff line number Diff line change
@@ -11,5 +11,6 @@ $green: #69b94a;
$yellow: #f5a939;
$red: #d6564b;
$gray: #AAA;
$light-gray: #eee;
$white: #FFFFFF;
$rounded-corners: 5px;
2 changes: 0 additions & 2 deletions app/views/layouts/_footer.html.haml
Original file line number Diff line number Diff line change
@@ -6,8 +6,6 @@
%i.icon.fa.fa-twitter-square.fa-3x
%a.iconLink{:href => "https://www.facebook.com/refugerestrooms", :aria => { :label => t('.aria-labels.facebook')}}
%i.icon.fa.fa-facebook-square.fa-3x
%a.iconLink{:href => "http://blog.refugerestrooms.org/", :aria => { :label => t('.aria-labels.tumblr')}}
%i.icon.fa.fa-tumblr-square.fa-3x
%a.iconLink{:href => contact_path, :aria => { :label => t('.aria-labels.email')}}
%i.icon.fa.fa-envelope.fa-3x
%br/
1 change: 0 additions & 1 deletion app/views/layouts/_navigation.html.haml
Original file line number Diff line number Diff line change
@@ -20,7 +20,6 @@
= t('.resources-dropdown-button-label')
%b.caret
%ul.dropdown-menu
%li
%li= link_to t('.download-unisex-restroom-signs-hyperlink-label'), page_path('signs')
%li= link_to t('.public-api-hyperlink-label'), '/api/docs/'
/ /.navbar-collapse
4 changes: 2 additions & 2 deletions config/application.rb
Original file line number Diff line number Diff line change
@@ -24,8 +24,8 @@ class Application < Rails::Application

# I18n stuff
config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
config.i18n.available_locales = [:en, :es, :fr, :hi, :it, :pl, :"pt-BR"]
#config.i18n.default_locale = :fr
config.i18n.available_locales = [:en, :es, :fil, :fr, :hi, :it, :pl, :"pt-BR", :tl]
config.i18n.default_locale = :en



3 changes: 2 additions & 1 deletion config/environments/production.rb
Original file line number Diff line number Diff line change
@@ -70,7 +70,8 @@

# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
# the I18n.default_locale when a translation cannot be found).
config.i18n.fallbacks = true
config.i18n.fallbacks = {:tl => [:fil,I18n.default_locale]}
config.i18n.fallbacks.default = I18n.default_locale

# Send deprecation notices to registered listeners.
config.active_support.deprecation = :notify
2 changes: 1 addition & 1 deletion config/locales/en/about.en.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ en:
p5header: 'What can we do to help?'
p5:
first: "<strong>First:</strong> Add listings. The database is only as big as you make it. The more listings, the more comprehensive and valuable the resource can be."
second: "<strong>Secondly:</strong> Spread the word. Tweet. Facebook. Tumblr. Blog. Whatever it is that you do, do it. Let people know about this resource."
second: "<strong>Secondly:</strong> Spread the word. Tweet. Facebook. Blog. Whatever it is that you do, do it. Let people know about this resource."
third: "<strong>Thirdly:</strong> If you know how to code, visit GitHub and let us know about a bug, suggest an improvement, or even contribute a little bit of code and help out the project. REFUGE is open source and we can't do it without you."
fourth: "<strong>Fourthly: </strong> Donate. Keep your eyes peeled for an upcoming crowd funding campaign to fund some of the technology we need to use as well as to pay our fabulous designers and engineers a little bit of money for their hard and tireless work. They have been working for free to bring this service to you and we don't want anybody to work for free. Most of the core team are transgender and underemployed at this time."
p6header: "Why is my business or organization listed?"
1 change: 0 additions & 1 deletion config/locales/en/footer.en.yml
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ en:
github: 'Refuge Restrooms on GitHub'
twitter: 'Refuge Restrooms on twitter'
facebook: 'Refuge Restrooms on Facebook'
tumblr: 'Refuge Restrooms blog on tumblr'
email: 'Email Refuge Restrooms'
refuge-restrooms-is-open-source: 'refuge restrooms is open source.'
code-on-github: 'code on github.'
22 changes: 22 additions & 0 deletions config/locales/fil/about.fil.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
fil:
about:
title: 'Ang tungkol sa REFUGE'
p1header: 'Ano ang REFUGE Restrooms?'
p1:
first: 'Ang Refuge Restrooms ay isang aplikasyon sa web na naglalayong magbigay ng ligtas na paraan ng pag-gamit sa pahingaan o banyo para sa mga transgender, intersex, at ibang kasarian ng indibidwal. Ang mga gumagamit ay maaaring makapaghanap ng mga pahingaan o banyo sa pamamagitan ng pinakamalapit na lokasyon, magdagdag ng bagong listahan ng mga pahingaan o banyo, pati ang pagbibigy ng mga komento at grado sa kasalukuyang nasa listahan.'
second: 'Kami ay nagbibigay daan at naghahangad na makapaglikha ng isang kumunidad na hindi lamang nakaabang sa paghahanap ng kasalukuyang ligtas na akses sa mga pahingaan, kundi kalakip na rin ang pagtataguyod sa mga transgender, intersex, at ang kaligtasan na iba pang kasarian.'
p2header: 'Saan nakuha ang lahat ng mga datus na ito?'
p2: 'Ang unang 4,500 na na-i-tala ay bilang pasasalamat sa dating Safe2Pee na database. Ang natitira sa aming database ay naitala ng aming mga gumagamit. Kapag may alam ka na para sa nyutral na kasarian o ligtas na pahingaan, kami ay nakikiusap na idagdag ito sa aming database!'
p3header: 'Bakit mo pinili ang pangalang REFUGE?'
p3: 'Matatag ang aming paniniwala na ang lahat ay mayroong karapatan na gumamit ng pahingaan nang ligtas at gusto namin na ang pangalan ng aming aplikasyon ay magkaroon ng dignidad na kapareha sa binibigay namin sa aming mga taga-gamit. Sa madaling salita, kami ay umaasa na makapagbigay ng isang lugar na kanlungan para sa oras ng inyong pangangailangan.'
p4header: "Ano ba ang malaking importansiya tungkol sa mga banyo/pahingaan sa kahit ano at bakit natin kailangan ang ganitong kaalaman?"
p4: "Isa sa pinakamalaking isyu tungkol sa paglaban para sa karapatan ng mga transgender ay ang pagkakaroon ng sariling mga pahingaan o banyo. Tila ba na bawat linggo ang transgender ay nasa sentro ng pambansang kwento ng balita dahil sa paggamit ng pahingaan o banyo na nakatalaga sa tamang pagkakakilanlan o kasarian. Kaya naman, tayo ay naniniwala na bawat transgender na tao ay mayroong karapatan na gumamit ng pahingaan o banyo kung gustuhin man nila. Gayunpaman, ating napagtanto na sa kabila ng tagumpay sa batas ngayong taon ng tungkol sa paggamit ng pahingaan o banyo, ay marami paring indibidwal na mga transgender ang nakararanas ng berbal at pisikal na pang-aabuso nangdahil lamang sa pahingaan o banyo. Walang nakakapagpahayag nito - at dahil diyan ginawa namin itong REFUGE."
p5header: 'Anu ang pwede nating gawin para makatulong?'
p5:
first: "<strong>Una:</strong> Magdagdag ng mga listahan. Ang database ay maging kasing laki kapag ginawa mo ito. Kapag maraming mga nasa listahan, ay mas magiging komprehensibo at mas magkakaroon ng kahalagahan ang pamamaraang ito."
second: "<strong>Ikalawa:</strong> Ikalat ang mga salita. Tweet. Facebook. Blog. Kahit anong gustuhin mo, gawin mo. Ipaalam mo sa lahat ng tao ang tungkol sa pamamaraang ito."
third: "<strong>Ikatlo:</strong> Kung alam mo kun paano mag-code, bumisita sa GitHub at ipaalam sa amin ang tungkol sa bug, magmungkahi ng mga pagpapahusay, o kaya mag-ambag ng kunting code at tumulong sa proyektong ito. Ang REFUGE ay isang open source at hindi namin ito magagawa kung wala kayo."
fourth: "<strong>Ikaapat: </strong> Mag-ambag. Maging mapagmatyag sa darating na pangangalap ng pondo mula sa mga tao para makapaglikha ng pondo sa iilang teknolohiya na kinakailangan gamitin pati narin ang pagbayad sa mga taga-desinyo at mga inhinyero kahit sa maliit na halaga para sa kanilang sipag at walang pagud na paggawa. Sila ay nagtratrabaho ng walang bayad para makapaghatid ng serbisyo sa inyo at hindi namin gusto na magtratrabaho ang sinuman ng libre. Karamihan sa aming grupo ay transgender at mga walang trabaho sa ngayon."
p6header: "Bakit nakalista ang aking negosyo o organisasyon?"
p6: "Alamin ang higit pa sa aming <a href='/business_info'>Impormasyon tungkol sa aming ginagawa</a>!"
contribute: 'I-fork mo kami at mag-ambag sa GitHub!'
23 changes: 23 additions & 0 deletions config/locales/fil/business_info.fil.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
fil:
business_info:
title: "Impormasyon tungkol sa ginagawa ng Refuge Restrooms"
p1header: "1) Ano ang Refuge Restrooms?"
p1: "Ang REFUGE ay isang web application na naglalayong magbigay ng ligtas na akses sa banyo para sa mga transgender, intersex, at mga indibidwal na di-magkatulad na kasarian. Magbasa nang higit pa tungkol sa amin sa aming <a href='/about'>Tungkol sa Pahina</a>."
p2header: "2) Paano napalista ang aking pasilidad sa listahang ito?"
p2: "Mayroong gumamit ang iyong banyo at isinumite ang iyong lokasyon bilang mapagkukunan. Ang lahat ng aming data ay isinumite ng iba't ibang taong mga gumagamit nito."
p3header: "3) Paano ako magiging isang mahusay na host?"
p3: "Salamat sa pagtatanong! Kadalasan, ang mga bisita ng REFUGE ay umaasa lamang na mabilis na huminto at magpatuloy, at tulad ng iba pang bisita, ay maaaring suportahan ang iyong negosyo o lokasyon habang kami ay naroon. Ang mahuhusay na kawani at mahusay na mga karanasan ay maaaring pumunta sa isang mahabang paraan sa pagkuha ng ilang mga pag-ibig para sa iyong lokasyon sa seksyon ng mga review ng app (higit pa sa na sa ibaba!)"
p4header: "4) Bakit isyu ang isang ligtas na banyo?"
p4:
first: "Ang paggamit ng banyo ay isang pang-araw-araw na aktibidad na mahirap para sa mga miyembro ng aming komunidad na pagtimunan - lalo na kapag bumibisita sa mga lugar sa labas ng kanilang pang-araw-araw na gawain. Iyan kung saan ang aming proyekto sa pagmamapa ay dumating."
second: "Ayon sa <a href='http://www.ustranssurvey.org/'>US Trans Survey</a>:"
list1: "59% ng mga sumasagot ang nag-iingat sa paggamit ng isang banyo para sa takot sa paghaharap"
list2: "31% iwasan ang pagkain o pag-inom habang nasa labas, upang maiwasan ang paggamit ng banyo"
list3: "24% ay nagkaroon ng kanilang presensya sa banyo na inuusisa"
list4: "12% ay ginigipit, tinutuligsa, o pinagsasamantalang sekswal sa isang banyo"
list5: "9% ay tinanggihan ang akses sa banyo"
list6: "8% ay nagkaroon ng isang isyu sa bato o impeksiyon sa ihi sa pag-iwas sa paggamit ng banyo"
p5header: "5) Ano ang ibig sabihin ng pagsusuri?"
p5: "Ang mga pagsusuri ay tumutulong sa mga bisita na magbahagi ng mga karanasan ng bawat isa tungkol sa lokasyon. Hinihikayat namin ang mga bisita na magbahagi ng mas maraming impormasyon gaya ng mayroon kami tungkol sa bawat lokasyon sa mapa."
p6header: "6) Paano ko aalisin ang aking listahan?"
p6: "Umaasa kami na iyong isasaalang-alang ang pagsunod sa iyong listahan; ito ay maaaring mangahulugan ng marami para sa kalusugan ng tao at kabutihan nito. Gayunpaman, kung mas gusto mong hindi nakalista, gamitin ang aming form sa pakikipag-ugnay upang humiling ng pag-alis at gagawin ito ng aming mga boluntaryo sa lalong madaling panahon na magagawa namin (ito ay isang bukas na proyektong pinagmulan upang lahat ng trabaho ay ginagawa ng mga boluntaryo)."
11 changes: 11 additions & 0 deletions config/locales/fil/contacts.fil.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
fil:
contacts:
new:
request-edit-for-restroom: 'Humiling ng pagbabago para sa %{restroom_name}'
contact-title: 'Makipag-ugnay'
leave-this-field-blank: 'Iwanang blangko ang patlang na ito!'
submitted:
thank-you-period: 'Salamat sa iyong mensahe.'
thank-you-exclamation: 'Salamat sa iyong mensahe!'
cannot-send: 'Hindi maipadala ang mensahe.'
we-will-get-back-to-you: "Babalik kami sa iyo sa lalong madaling panahon."
59 changes: 59 additions & 0 deletions config/locales/fil/devise.fil.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# Mga karagdagang mga pagsasalin ng salita ay makikita sa https://github.com/plataformatec/devise/wiki/I18n

fil:
devise:
confirmations:
confirmed: "Ang iyong account ay matagumpay na nakumpirma."
send_instructions: "Ikaw ay makakatanggap ng email na may kalakip na mga instruksiyon tungkol sa kung papaano i-kumpirma ang iyong account sa kakaunting minuto."
send_paranoid_instructions: "Kapag ang iyong email address ay nasa aming database na, ikaw ay makakatanggap ng email sa loob ng ilang minuto na may kasamang mga instruksiyon kung papaano i-kumpirma ang iyong account"
failure:
already_authenticated: "Ikaw ay ay naka-signed in na."
inactive: "Ang iyong account ay hindi pa aktibo."
invalid: "Hindi tama ang email o password."
locked: "Ang iyong account ay nai-locked."
last_attempt: "Mayroon kapang isang subok bago ma-locked ang iyong account."
not_found_in_database: "Hindi tama ang email o password."
timeout: "Ang sesyon ay natapos na. Kung maaari mag-sign in para makapagpatuloy."
unauthenticated: "Kailangan mong mag-sign in o mag-sign up bago magpatuloy."
unconfirmed: "Kinakailangan mong magkumpirma sa iyong account bago magpatuloy."
mailer:
confirmation_instructions:
subject: "Ang mga instruksiyon para sa kumpirmasyon"
reset_password_instructions:
subject: "Instruksyion sa paguulit ng iyong password"
unlock_instructions:
subject: "Instruksiyon sa pag unlock ng iyong account"
omniauth_callbacks:
failure: "Hindi makapagpatotoo sa iyo mula sa %{kind} dahil sa \"%{reason}\"."
success: "Matagumpay na napatotoo mula sa %{kind} account."
passwords:
no_token: "Hindi ka maka-akses sa pahinang ito kung wala kang password reset mula sa iyong email. Kapag gusto mong baguhin ang password gamit ang email, dapat siguraduhin na gamitin ang buong URL na ibinigay."
send_instructions: "Ikaw ay makatanggap ng email na may kalakip na mga tungkol sa kung papaano ma-reset ang iyong password sa iilang minuto."
send_paranoid_instructions: "Kung ang iyong email ay nasa database na namin, makakatanggap ka ng isang link sa pagbawi ng password sa iyong email address sa ilang minuto."
updated: "Ang password mo ay matagumpay na napalitan.Ikaw ngayon ay naka-signed in na."
updated_not_active: "Ang iyong password ay matagumpay nang napalitan."
registration:
destroyed: "Paalam! Ang iyong account ay matagumpay na nakansela. Ninanais naming makita kayong muli."
signed_up: "Maligayang pagdating! Matagumpay kang nakapag-sign up"
signed_up_but_inactive: "Ikaw ay matagumpay na nakapag-sign up. Gayunpaman, hindi pa namin kayo mapasign in dahil ang iyong account ay hindi pa aktibo."
signed_up_but_locked: "Ikaw ay matagumpay na naka-signed up. Gayunpaman,, hindi pa namin kayo mapasign in dahil ang iyong account ay nakalock."
signed_up_but_unconfirmed: "Ang mensahe na may kumpirmasyon sa link ay naipadala na sa iyong email address. Kami ay nakikiusap na buksan ang link para mapagana ang iyong account."
update_needs_confirmation: "Ang iyong account ay matagumpay nang na-updeyt, pero kinakailangan pa naming i-verify ang iyong bagong email address. Kami ay nakiki-usap na tingnan ang iyong email at mag-klik sa confirm link para ma-finalize ang pagkumpirma sa iyong bagong email address."
updated: "Matagumpay mong na-update ang iyong account."
sessions:
signed_in: "Matagumpay kang nakapag-sign in."
signed_out: "Matagumpay kang nakapag-sign out."
unlocks:
send_instructions: "Ikaw ay makakatanggap ng email sa ilang minuto na may kalakip na mga instruksiyon tungkol sa kung papaano ma-unlock ang iyong account."
send_paranoid_instructions: "Kapag ang iyong account ay umiiral, ikaw ay makakatanggap ng email namay kalakip na instruksiyon tungkol sa kung papaano ito ma-unlock sa iilang minuto."
unlocked: "Ang iyong account ay matagumpay nang na-unlock. Mag-sign in para makapagpatuloy."
errors:
messages:
already_confirmed: "tapos nang nakumpirma, maaaring subukang magsign in"
confirmation_period_expired: "kailangang kumpirmahin sa loob ng %{period}, maaaring magbigay ng bagong rekwest"
expired: "nag-expire na, mangyaring humiling ng bago"
not_found: "hindi makita"
not_locked: "hindi nakalocked"
not_saved:
one: "may 1 mali na nagbabawal sa %{resource} para mai-save:"
other: "%{count} may mga mali na nagbabawal sa %{resource} para mai-save:"
14 changes: 14 additions & 0 deletions config/locales/fil/footer.fil.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
fil:
layouts:
footer:
aria-labels:
github: 'Refuge Restrooms sa GitHub'
twitter: 'Refuge Restrooms sa twitter'
facebook: 'Refuge Restrooms sa Facebook'
email: 'Mag-padala ng mensahe sa Refuge Restrooms'
refuge-restrooms-is-open-source: 'Ang Refuge Restrooms ay bukas para sa lahat na gamitin.'
code-on-github: 'code sa github.'
contribute-to-the-project: 'mag-ambag sa proyekto'
on-patreon: 'sa patreon.'
copyleft: 'copyleft'
refuge-restrooms: 'Refuge Restrooms'
11 changes: 11 additions & 0 deletions config/locales/fil/navigation.fil.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
fil:
layouts:
navigation:
toggle-navigation-button-label: 'I-toggle ang nabigasyon'
submit-a-new-restroom-hyperlink-label: 'Magsumite ng Bagong Banyo'
about-hyperlink-label: 'Tungkol sa'
contact-hyperlink-label: 'Makipag-ugnay sa'

resources-dropdown-button-label: 'Mga Mapagkukunan'
download-unisex-restroom-signs-hyperlink-label: 'I-download ang Mga Palatandaan ng Unisex na Banyo'
public-api-hyperlink-label: 'Pampublikong API'
64 changes: 64 additions & 0 deletions config/locales/fil/restroom.fil.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
fil:
activerecord:
attributes:
restroom:
# only overridden attributes here, defaults work as expected
# (e.g. database field 'city' will be appear as 'City')
name: 'Lokasyon/Lugar/Pangalan ng Negosyo'
street: 'Kalyeng kinaroroonan'
state: 'Estado/Probinsya'
access: 'Madaling ma-akses?'
bath_type: 'Uri ng Pahingahan o Banyo'

search_bar:
enter_location: 'I-lagay ang kinaroroonan'

restroom:
add_new: 'Magsumita ng Pahingahan o banyo sa aming database'
preview: 'Prebyu'
required: '* markahan ang kailangan na field'
guess_location: 'Magpalagay ng kasalukuyang lokasyon'
directions: 'Direksyon'
directions_hint: '(hal.: ikatlong palapag sa likod, sa may bihisanang kwarto...)'
distance:
miles: 'milya'
kilometers: 'kilometro'
comments_hint: '(hal.: ikaw ay dapat mamimili, ikaw ay dapat na kumilos na parang nag-titingin lamang ng saglit...)'
comments: 'Mga komento'
accessible: 'Madaling ma-akses'
not_accessible: 'Hindi pwedeng ma-akses'
changing_table: 'Pagpapalit ng mesa'
no_changing_table: 'Walang pagpapalit ng mesa'
type:
unisex: 'Unisex / Nyutral na kasarian'
single_stall: 'May pangalan ng kasarian sa isang puwesto o ligtas na lugar'
restsubmit: 'I-save ang banyo'
rating:
positive: '%{percentage}% positibo'
unrated: 'Hindi pa nagradohan'
upvote: 'Mahal ko to!'
downvote: 'Hindi ligtas'
confirm:
upvote: 'Sigurado ka ba na gusto mong sang-ayunan ang pahingahang ito?'
downvote: 'Sigurado ka ba na gusto mong hindi sang-ayunan ang pahingahang ito?'
flash:
field: 'Ang kinakailangang ay naiwang blangko. Maaaring suriin muli ang pagpasa at muling i-submit ang form.'
unexpected: 'Kami ay nakakaranas ng hindi inaasahang problema, maaaring komuntak sa amin kung ang proleba ay magpapatuloy.'
upvoteerror: 'Mayroong hindi inaasahan problema sa pagsang-ayon sa pahingahang ito.'
upvotesuccess: 'Ang pahingahang ito ay nasang-ayunan na! maraming salamat sa pagbigay kontribusyon sa aming kumonidad.'
downvoteerror: 'Mayroong hindi inaasahang problema sa hindi pagsang-ayon sa pahingahang ito.'
downvotesuccess: 'Ang banyo na ito ay hindi nasang-ayunan na! Maraming salamat sa pagbigay kontribusyon sa aming kumonidad.'
new: 'Ang bagong pasko na pahingahan o banyo ay naisagawa na %{name}.'
edit: 'Na-isumite na ang iyong pag-babago. Susuriin namin ito at babaguhin ang listahan'
updated: 'Ang entry ng pahingahan o banyo ay na-bago na'
deleted: 'Ang pahingahang ito ay naalis na'
searcherror: 'May error sa paghahanap ng lokasyon.'
spam: 'Ang iyong isinumite ay tinanggihan bilang spam.'
edit:
editlisting: Maghain ng isang pag-babago sa listahan na ito"

restrooms:
nearby:
heading: 'Kalapit na mga pahingahan o banyo'
body: 'bago magsumita ng pahingahan o banyo, siguraduhin na hindi ito kabilang sa mga kilala nang mga banyo sa malapit.'
none: 'Walang nakitang mga banyo sa malapit.'
8 changes: 8 additions & 0 deletions config/locales/fil/restrooms.fil.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
fil:
restrooms:
index:
map-view-button-label: 'Tingna ang Mapa'

show:
thumbs-up-button-label: 'Sang-ayunan'
thumbs-down-button-label: 'Huwag Sang-ayunan'
5 changes: 5 additions & 0 deletions config/locales/fil/search.fil.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
fil:
layouts:
search:
search: 'Paghahanap'
search-by-current-location: 'Maghanap ayon sa Kasalukuyang Lokasyon'
8 changes: 8 additions & 0 deletions config/locales/fil/signs.fil.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
fil:
pages:
signs:
title: 'Nada-download na Mga Palatandaan ng Banyo'
intro: 'Kung mayroon kang pampublikong banyo sa iyong gusali o negosyo na neutral sa kasarian, ipaalam sa mga tao. Ikaw (at / o ang may-ari / pamamahala ng gusali) ay maaaring idagdag ito sa database, at mag-sumite ng isa sa mga tanda sa ibaba upang ipaalam sa mga tao na sinusuportahan mo ang ligtas na pag-gamit para sa lahat. Ang parehong mga palatandaan ay maaaring imprentahin na mga PDF file.'
head-accessible: 'Magagamit na mga Banyo'
head-non-accessible: 'Mga Banyo na Hindi Mapupuntahan'
download: 'I-download ang PDF'
54 changes: 54 additions & 0 deletions config/locales/fil/simple_form.fil.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# See this documentation: https://github.com/plataformatec/simple_form#i18n
# And this StackOverflow answer: https://stackoverflow.com/questions/35906089/changing-simple-form-submit-button-i18n-text

fil:
simple_form:
"yes": 'Oo'
"no": 'Hindi'
required:
text: 'kailangan'
mark: '*'
# You can uncomment the line below if you need to overwrite the whole required html.
# When using html, text and mark won't be used.
# html: '<abbr title="required">*</abbr>'
error_notification:
default_message: "Mangyaring suriin ang mga problema sa ibaba:"

labels:
defaults:
name: 'Pangalan'
street: 'Kalye'
city: 'Lungsod'
state: 'Estado / Lalawigan'
country: 'Bansa'
accessible: 'Magagamit'
unisex: 'Unisex'
changing_table: 'Pagpapalit ng lamesa'
directions: 'Mga Direksyon'
comment: 'Magkomento'
email: 'Email'
message: 'Mensahe'
contact:
name: 'Pangalan'
email: 'Email'
message: 'Mensahe'

helpers:
submit:
contact:
# This is the "Send message" button on the "Contact" page.
create: 'Magpadala ng Mensahe'

# Labels and hints examples
# labels:
# defaults:
# password: 'Password'
# user:
# new:
# email: 'E-mail upang mag-sign in.'
# edit:
# email: 'E-mail.'
# hints:
# defaults:
# username: 'Pangalan ng user na mag-sign in.'
# password: 'Walang espesyal na mga character, mangyaring.'
11 changes: 11 additions & 0 deletions config/locales/fil/splash.fil.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
fil:
pages:
index:
life-is-tough: 'Minsan ang buhay ay matigas ...'
find-refuge: 'Maghanap ng Refuge'
add-restroom-button-label: 'Magdagdag ng isa pang Banyo'

html-alt-attributes:
app-store: 'I-download ang Refuge Restrooms iOS app'
play-store: 'I-download ang Refuge Restrooms Android app'
patreon: 'Suportahan ang proyekto sa Patreon'
7 changes: 7 additions & 0 deletions config/locales/fil/text_msg.fil.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
fil:
pages:
text:
title: 'Kumuha ng pinakamalapit na banyo sa pamamagitan ng Teksto'
intro: 'Kung kailangan mo lamang upang makakuha ng pinakamalapit at ligtas na banyo <em>ngayon</em>, maaari mong makuha ito sa pamamagitan ng text sa anumang telepono na may SMS.'
instructions: 'I-text ang iyong lokasyon sa +1 (415) 367-3288'
tip: "Para sa pinaka-tumpak na mga resulta, isama ang kalyeng kinaroroonan, lungsod, estado at bansa. Makakakuha ka agad ng pangalan ng lokasyon at kinaroroonan!"
5 changes: 3 additions & 2 deletions db/seeds.rb
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@

Restroom.transaction do
CSV.foreach('db/export.csv') do |row|
Restroom.create(
restroom = Restroom.create(
:name => row[1],
:street => row[3],
:city => row[4],
@@ -23,5 +23,6 @@
:longitude => row[9],
:country => row[6]
)
restroom.update(edit_id: restroom.id)
end
end
end
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
db:
image: postgres
image: postgres:alpine
web:
build: .
entrypoint: [setup/entry]
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
"jquery-ujs": "^1.2.2",
"popper.js": "^1.14.3",
"rails-erb-loader": "^5.4.2",
"swagger": "^0.7.5",
"swagger": "swagger-api/swagger-node#efffbbe68091b18ab6ececa06df9b41f1a4933b1",
"swagger-ui": "^3.19.2",
"yarn": ">=1.0.2"
},
3,180 changes: 1,942 additions & 1,238 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 8e091b6

Please sign in to comment.