amacocian/monica
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

chore: switch to main branch

Browse Source
This commit is contained in:
Alexis Saettler
2022-01-13 20:54:34 +01:00
parent fef9d432c4
commit 6a0af31efc
39 changed files with 66 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/PULL_REQUEST_TEMPLATE.md
+4 -4
View File
@@ -5,13 +5,13 @@ Please read the list below. Feel free to delete this text after but we need you
### Checklist
#### Before submitting the PR
- [ ] Read the [CONTRIBUTING document](https://github.com/monicahq/monica/blob/master/CONTRIBUTING.md) before submitting your PR.
- [ ] Read the [CONTRIBUTING document](https://github.com/monicahq/monica/blob/main/CONTRIBUTING.md) before submitting your PR.
- [ ] If the PR is related to an issue or fix one, don't forget to indicate it.
- [ ] Create your PR as draft if it is not final yet. Mark it as ready... when it’s ready. Otherwise the PR will be considered complete and rejected if it's not working.
### General checks
- [ ] Make sure that the change you propose is the smallest possible.
- [ ] The name of the PR should follow the [conventional commits guideline](https://github.com/monicahq/monica/blob/master/docs/contribute/readme.md#conventional-commits) that the project follows.
- [ ] The name of the PR should follow the [conventional commits guideline](https://github.com/monicahq/monica/blob/main/docs/contribute/readme.md#conventional-commits) that the project follows.
### Front-end changes
- [ ] If you change the UI, make sure to ask repositories administrators first about your changes by pinging djaiss or asbiin in this PR.
@@ -30,6 +30,6 @@ Please read the list below. Feel free to delete this text after but we need you
- [ ] Make sure account reset and deletion still work.
#### Other tasks
- [ ] [CONTRIBUTORS](https://github.com/monicahq/monica/blob/master/CONTRIBUTORS) entry added, if necessary.
- [ ] If it's relevant and worth mentioning, create a changelog entry for this change. The changelog entry will appear inside the UI for all users to see. To know if your change is worth the creation of a changelog entry, [read the documentation](https://github.com/monicahq/monica/blob/master/docs/administrators/tips.md#when-is-it-relevant-to-create-a-changelog-entry).
- [ ] [CONTRIBUTORS](https://github.com/monicahq/monica/blob/main/CONTRIBUTORS) entry added, if necessary.
- [ ] If it's relevant and worth mentioning, create a changelog entry for this change. The changelog entry will appear inside the UI for all users to see. To know if your change is worth the creation of a changelog entry, [read the documentation](https://github.com/monicahq/monica/blob/main/docs/administrators/tips.md#when-is-it-relevant-to-create-a-changelog-entry).
- [ ] Don't forget to [ask for a free account](mailto:regis@monicahq.com) on https://monicahq.com as anyone who contributes can request a free account.
.github/workflows/docker.yml
+2 -2
View File
@@ -3,7 +3,7 @@ name: Docker
on:
push:
branches:
- master
- main
env:
php-version: '8.0'
@@ -12,7 +12,7 @@ env:
jobs:
docker-run:
runs-on: ubuntu-latest
name: Docker build master
name: Docker build developpment
strategy:
fail-fast: false
.github/workflows/lock.yml
+1 -1
View File
@@ -1,4 +1,4 @@
name: 'Lock Threads'
name: Lock Threads
# See https://github.com/dessant/lock-threads
on:
.github/workflows/migration_tests.yml
-2
View File
@@ -1,8 +1,6 @@
name: Migration tests
on:
push:
branches: [master]
pull_request:
types: [opened, synchronize, reopened]
branches-ignore: ['l10n_master*']
.github/workflows/tests.yml
+1 -1
View File
@@ -2,7 +2,7 @@ name: Unit tests
on:
push:
branches: [master]
branches: [main]
pull_request:
types: [opened, synchronize, reopened]
branches-ignore: ['l10n_master*']
.releaserc
+1 -1
View File
@@ -29,7 +29,7 @@
[
"semantic-release-github-pullrequest",
{
"baseRef": "master",
"baseRef": "main",
"assets": ["CHANGELOG.md"],
"labels": [
"semantic-release",
CONTRIBUTING.md
+1 -1
View File
@@ -30,7 +30,7 @@ git checkout -b 325-add-japanese-translations
### 3. Get the test suite running
Make sure you follow the [instructions](https://github.com/monicahq/monica/blob/master/docs/contribute/readme.md#testing-environment)
Make sure you follow the [instructions](https://github.com/monicahq/monica/blob/main/docs/contribute/readme.md#testing-environment)
on how to setup the test suite.
### 4. Did you find a bug?
README.md
+2 -2
View File
@@ -11,7 +11,7 @@
[![Docker pulls](https://img.shields.io/docker/pulls/library/monica)](https://hub.docker.com/_/monica/)
![Lines of code](https://img.shields.io/tokei/lines/github/monicahq/monica)
[![Code coverage](https://img.shields.io/sonar/coverage/monica?server=https%3A%2F%2Fsonarcloud.io&style=flat-square&label=Coverage%20Status)](https://sonarcloud.io/project/activity?custom_metrics=coverage&graph=custom&id=monica)
[![License](https://img.shields.io/github/license/monicahq/monica)](https://github.com/monicahq/monica/blob/master/LICENSE.md)
[![License](https://img.shields.io/github/license/monicahq/monica)](https://github.com/monicahq/monica/blob/main/LICENSE.md)
</div>
@@ -123,7 +123,7 @@ There are multiple ways of getting started with Monica:
- Platform.sh [![Deploy on Platform.sh](https://platform.sh/images/deploy/deploy-button-lg-blue.svg)](https://console.platform.sh/projects/create-project/?template=https%3A%2F%2Fgithub.com%2Fmonicahq%2Fmonica&amp;utm_campaign=deploy_on_platform&amp;utm_medium=button&amp;utm_source=affiliate_links&amp;utm_content=https%3A%2F%2Fgithub.com%2Fmonicahq%2Fmonica)
- [Heroku](https://heroku.com) [![Deploy to Heroku](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/monicahq/monica/tree/master)
- [Heroku](https://heroku.com) [![Deploy to Heroku](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/monicahq/monica/tree/main)
### Requirements
app.json
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "Monica",
"description": "Personal Relationship Manager - a new kind of CRM to manage your friends and family.",
"repository": "https://github.com/monicahq/monica",
"logo": "https://raw.githubusercontent.com/monicahq/monica/master/public/img/monica_60.png",
"logo": "https://raw.githubusercontent.com/monicahq/monica/main/public/img/monica_60.png",
"keywords": [
"CRM",
"family",
config/lang-detector.php
+1 -1
View File
@@ -25,7 +25,7 @@ return [
* You could use parse_langs_to_array to use the string syntax
* or just use the array of languages with its aliases.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
'languages' => parse_langs_to_array(
env('LANG_DETECTOR_LANGUAGES', [
docs/contribute/readme.md
+2 -2
View File
@@ -196,7 +196,7 @@ We follow [GitHub Flow](https://guides.github.com/introduction/flow/) to manage
We follow the [conventional commit message](https://conventionalcommits.org/) syntax for our commits. For instance, `feat: allow provided config object to extend other configs` or `feat(lang): added polish language`.
Every feature branch that is squashed onto master must follow these rules.
Every feature branch that is squashed onto main branch must follow these rules.
The benefits are:
* a standard way of writing commit messages for every contributor,
@@ -219,7 +219,7 @@ Moreover, every commit message needs to be written in lowercase.
* ✅ feat(lang): added polish language
* ❌ feat(lang): Added polish language
All the commits in a pull request are squashed when merged into master. That means *only the commit message of the squashed branch needs to follow this commit message convention*. That also means that you don't need to follow this convention for commits within a branch, which will usually contains a lot of commits with a `wip` title.
All the commits in a pull request are squashed when merged into main branch. That means *only the commit message of the squashed branch needs to follow this commit message convention*. That also means that you don't need to follow this convention for commits within a branch, which will usually contains a lot of commits with a `wip` title.
<a id="markdown-backend" name="backend"></a>
## Backend
docs/contribute/translate.md
+6 -6
View File
@@ -22,10 +22,10 @@ You can [open an issue](https://github.com/monicahq/monica/issues/new) to reques
To enable a new language in Monica:
* we have to configure it in Crowdin first. This is something we must do ourselves (we: members of the project). To do it, we need to go to Settings > Translations > Target Languages and add the new locale here.
* add the name of the language in [the main English settings file](https://github.com/monicahq/monica/blob/master/resources/lang/en/settings.php).
* update the [lang-detector.php file](https://github.com/monicahq/monica/blob/master/config/lang-detector.php) by adding the new locale abbreviation (please add it in alphabetic order).
* add the locale in the [webpack.mix.js file](https://github.com/monicahq/monica/blob/master/webpack.mix.js) (please add it in alphabetic order).
* (optional) when adding a country-specific language (like 'en-GB'), you may need to update the [crowdin.yml config file](https://github.com/monicahq/monica/blob/master/crowdin.yml).
* add the name of the language in [the main English settings file](https://github.com/monicahq/monica/blob/main/resources/lang/en/settings.php).
* update the [lang-detector.php file](https://github.com/monicahq/monica/blob/main/config/lang-detector.php) by adding the new locale abbreviation (please add it in alphabetic order).
* add the locale in the [webpack.mix.js file](https://github.com/monicahq/monica/blob/main/webpack.mix.js) (please add it in alphabetic order).
* (optional) when adding a country-specific language (like 'en-GB'), you may need to update the [crowdin.yml config file](https://github.com/monicahq/monica/blob/main/crowdin.yml).
Then, submit your PR for review. A good example of adding a new locale can [be found here](https://github.com/monicahq/monica/pull/3356).
@@ -41,7 +41,7 @@ Translation appears in two types of files in the codebase: in Laravel (php) and
Example: `:name’s birthday` => `anniversaire de :name`
- **plural forms**: see [laravel doc](https://laravel.com/docs/5.6/localization#pluralization) for documentation. It supports basic and occidental plural variations, each one being defined in [here](https://github.com/laravel/framework/blob/5.6/src/Illuminate/Translation/MessageSelector.php#L110).
Example: `1 message|:count messages` => `:count message|:count messages`, or: `{1}:count message|[2,*]:count messages`
- **format strings**: we use [Carbon](http://carbon.nesbot.com/docs/#api-commonformats) to handle dates. [format.php](https://github.com/monicahq/monica/blob/master/resources/lang/en/format.php) file contains format we use to export dates as strings in the right localized format. See [php doc](http://www.php.net/manual/en/function.date.php) to know which format you can use.
- **format strings**: we use [Carbon](http://carbon.nesbot.com/docs/#api-commonformats) to handle dates. [format.php](https://github.com/monicahq/monica/blob/main/resources/lang/en/format.php) file contains format we use to export dates as strings in the right localized format. See [php doc](http://www.php.net/manual/en/function.date.php) to know which format you can use.
### With Vue.js
@@ -53,7 +53,7 @@ We use the [vue-i18n](https://www.npmjs.com/package/vue-i18n) package.
- Example: `{name}’s birthday` => `anniversaire de {name}`
- Other example: `{{ $t('people.stay_in_touch_frequency', { count: frequency }) }}`
- **plural forms**: See [vue-i18n doc](http://kazupon.github.io/vue-i18n/en/pluralization.html).
Pluralization is customized in the [pluralization.js](https://github.com/monicahq/monica/blob/master/resources/js/pluralization.js) file. This should fit your language pluralization form. Messages must be separated by a pipe, but you cannot define the number of occurrences it applies to like with Laravel translation (no brackets or braces).
Pluralization is customized in the [pluralization.js](https://github.com/monicahq/monica/blob/main/resources/js/pluralization.js) file. This should fit your language pluralization form. Messages must be separated by a pipe, but you cannot define the number of occurrences it applies to like with Laravel translation (no brackets or braces).
Example: `1 message|{count} messages` => `{count} message|{count} messages` in French, or: `{count}条消息` in Chinese (only 1 form)
## Rules for translation
docs/installation/providers/cpanel.md
+2 -2
View File
@@ -66,7 +66,7 @@ cd /public_html/[subdomain you wish to install monica on]
git clone https://github.com/monicahq/monica.git
```
You should check out a tagged version of Monica since `master` branch may not always be stable. Find the latest official version on the [release page](https://github.com/monicahq/monica/releases).
You should check out a tagged version of Monica since `main` branch may not always be stable. Find the latest official version on the [release page](https://github.com/monicahq/monica/releases).
```sh
cd /var/www/monica
@@ -108,7 +108,7 @@ As the configuration of the application is cached, any update on the `.env` file
### 4. Configure cron job
Monica requires some background processes to continuously run. The list of things Monica does in the background is described [here](https://github.com/monicahq/monica/blob/master/app/Console/Kernel.php#L63).
Monica requires some background processes to continuously run. The list of things Monica does in the background is described [here](https://github.com/monicahq/monica/blob/main/app/Console/Kernel.php#L63).
Basically those crons are needed to send reminder emails and check if a new version is available.
To do this, setup a cron that runs every minute that triggers the following command `php artisan schedule:run`.
docs/installation/providers/debian.md
+2 -2
View File
@@ -96,7 +96,7 @@ cd /var/www/
sudo git clone https://github.com/monicahq/monica.git
```
You should check out a tagged version of Monica since `master` branch may not always be stable.
You should check out a tagged version of Monica since `main` branch may not always be stable.
Find the latest official version on the [release page](https://github.com/monicahq/monica/releases)
```sh
@@ -165,7 +165,7 @@ exit
### 4. Configure cron job
Monica requires some background processes to continuously run. The list of things Monica does in the background is described [here](https://github.com/monicahq/monica/blob/master/app/Console/Kernel.php#L63).
Monica requires some background processes to continuously run. The list of things Monica does in the background is described [here](https://github.com/monicahq/monica/blob/main/app/Console/Kernel.php#L63).
Basically those crons are needed to send reminder emails and check if a new version is available.
To do this, setup a cron that runs every minute that triggers the following command `php artisan schedule:run`.
docs/installation/providers/generic.md
+2 -2
View File
@@ -84,7 +84,7 @@ cd /var/www
git clone https://github.com/monicahq/monica.git
```
You should check out a tagged version of Monica since `master` branch may not always be stable. Find the latest official version on the [release page](https://github.com/monicahq/monica/releases).
You should check out a tagged version of Monica since `main` branch may not always be stable. Find the latest official version on the [release page](https://github.com/monicahq/monica/releases).
```sh
cd /var/www/monica
@@ -146,7 +146,7 @@ As the configuration of the application is cached, any update on the `.env` file
### 4. Configure cron job
Monica requires some background processes to continuously run. The list of things Monica does in the background is described [here](https://github.com/monicahq/monica/blob/master/app/Console/Kernel.php#L63).
Monica requires some background processes to continuously run. The list of things Monica does in the background is described [here](https://github.com/monicahq/monica/blob/main/app/Console/Kernel.php#L63).
Basically those crons are needed to send reminder emails and check if a new version is available.
To do this, setup a cron that runs every minute that triggers the following command `php artisan schedule:run`.
docs/installation/providers/heroku.md
+4 -4
View File
@@ -2,7 +2,7 @@
Monica can be deployed on Heroku using the button below:
[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/monicahq/monica/tree/master)
[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/monicahq/monica/tree/main)
- [Installation](#installation)
- [Configuration](#configuration)
@@ -35,7 +35,7 @@ Monica doesn't require a lot of power - it will run perfectly fine on the free p
After deployment, the configuration of your app should look like this:
![picture of configuration](https://raw.githubusercontent.com/monicahq/monica/master/docs/images/heroku_dashboard-resources.png)
![picture of configuration](https://raw.githubusercontent.com/monicahq/monica/main/docs/images/heroku_dashboard-resources.png)
Note that when you deploy with the "Deploy to Heroku" purple button, only 1 dyno ("web") is activated while the "queue" one is not. That is OK - the "queue" dyno is only helpful if you set `QUEUE_CONNECTION=database` (default is 'sync').
@@ -124,9 +124,9 @@ Client secret: zsfOHGnEbadlBP8kLsjOV8hMpHAxb0oAhenfmSqq
You can update your Monica instance to the latest version by cloning the repository and pushing it to Heroku git.
Clone the Monica repository to your local environment by `git clone https://github.com/monicahq/monica`, and add heroku git repository by `heroku git:remote -a (heroku app name)`. Then, push to heroku by `git push heroku master`. Heroku will build and update the repository, automatically.
Clone the Monica repository to your local environment by `git clone https://github.com/monicahq/monica`, and add heroku git repository by `heroku git:remote -a (heroku app name)`. Then, push to heroku by `git push heroku main:master`. Heroku will build and update the repository, automatically.
See more information about updating Monica (including Heroku-specific things) [here](https://github.com/monicahq/monica/blob/master/docs/installation/update.md).
See more information about updating Monica (including Heroku-specific things) [here](https://github.com/monicahq/monica/blob/main/docs/installation/update.md).
## Update from 2.x to 3.x
docs/installation/providers/ubuntu.md
+2 -2
View File
@@ -108,7 +108,7 @@ cd /var/www
git clone https://github.com/monicahq/monica.git
```
You should check out a tagged version of Monica since `master` branch may not always be stable. Find the latest official version on the [release page](https://github.com/monicahq/monica/releases):
You should check out a tagged version of Monica since `main` branch may not always be stable. Find the latest official version on the [release page](https://github.com/monicahq/monica/releases):
```sh
cd /var/www/monica
@@ -170,7 +170,7 @@ exit
### 4. Configure cron job
Monica requires some background processes to continuously run. The list of things Monica does in the background is described [here](https://github.com/monicahq/monica/blob/master/app/Console/Kernel.php#L33).
Monica requires some background processes to continuously run. The list of things Monica does in the background is described [here](https://github.com/monicahq/monica/blob/main/app/Console/Kernel.php#L33).
Basically those crons are needed to send reminder emails and check if a new version is available.
To do this, setup a cron that runs every minute that triggers the following command `php artisan schedule:run`.
docs/installation/providers/vagrant.md
+3 -3
View File
@@ -22,7 +22,7 @@ cd ~/monica
```
3. Download the `Vagrantfile` script
```sh
curl -sS https://raw.githubusercontent.com/monicahq/monica/master/scripts/vagrant/Vagrantfile -o Vagrantfile
curl -sS https://raw.githubusercontent.com/monicahq/monica/main/scripts/vagrant/Vagrantfile -o Vagrantfile
```
4. Edit Vagrantfile to set the appropriate host port number (default: 8080)
```
@@ -57,8 +57,8 @@ Once the process is complete you can either access the virtual machine by typing
1. Download the `Vagrantfile` script
```sh
curl -sS https://raw.githubusercontent.com/monicahq/monica/master/scripts/vagrant/build/Vagrantfile -o Vagrantfile
curl -sS https://raw.githubusercontent.com/monicahq/monica/master/scripts/vagrant/build/install-monica.sh -o install-monica.sh
curl -sS https://raw.githubusercontent.com/monicahq/monica/main/scripts/vagrant/build/Vagrantfile -o Vagrantfile
curl -sS https://raw.githubusercontent.com/monicahq/monica/main/scripts/vagrant/build/install-monica.sh -o install-monica.sh
```
2. Run the box by calling:
```sh
docs/installation/update.md
+6 -6
View File
@@ -15,9 +15,9 @@ or if you have installed Monica on your own server, you need to follow the steps
1. Always make a backup of your data before upgrading.
2. Check that your backup is valid.
3. Read the [release notes](https://github.com/monicahq/monica/blob/master/CHANGELOG.md) to check for breaking changes.
3. Read the [release notes](https://github.com/monicahq/monica/blob/main/CHANGELOG.md) to check for breaking changes.
4. Update sources:
1. Consider check out a tagged version of Monica since `master` branch may not always be stable.
1. Consider check out a tagged version of Monica since `main` branch may not always be stable.
Find the latest official version on the [release page](https://github.com/monicahq/monica/releases)
```sh
# Get latest tags from GitHub
@@ -25,9 +25,9 @@ or if you have installed Monica on your own server, you need to follow the steps
# Clone the desired version
git checkout tags/v2.18.0
```
2. Or check out `master`
2. Or check out `main`
```sh
git pull origin master
git pull origin main
```
5. Update the dependencies of the project:
```sh
@@ -51,7 +51,7 @@ You can update your Monica instance to the latest version by cloning the reposit
1. Clone the Monica repository to your local environment by `git clone https://github.com/monicahq/monica.git`.
1. Add your app's heroku git repository by `heroku git:remote -a (heroku app name)` (this of course requires the [Heroku CLI](https://devcenter.heroku.com/articles/heroku-cli).
1. Push to heroku by `git push heroku master`. Heroku will build and update the repository, automatically.
1. Push to heroku by `git push heroku main:master`. Heroku will build and update the repository, automatically.
## Importing vCards (CLI only)
@@ -90,7 +90,7 @@ There is one caveat with the SQL exporter: you can't get the photos you've uploa
### Importing SQL into Heroku
If you're running your own Monica Heroku instance as mentioned in the [Heroku Installation Documentation](https://github.com/monicahq/monica/blob/master/docs/installation/providers/heroku.md), you're not actually running your own SQL server, which means that the solutions above might not be of assistance.
If you're running your own Monica Heroku instance as mentioned in the [Heroku Installation Documentation](https://github.com/monicahq/monica/blob/main/docs/installation/providers/heroku.md), you're not actually running your own SQL server, which means that the solutions above might not be of assistance.
Heroku dynos use a [ClearDB MySQL add-on](https://devcenter.heroku.com/articles/cleardb) as their database. You can still use an SQL admin tool (like phpMyAdmin or Sequel Pro) to interact with the database, as well as use the `mysql-client` command line tool, you just need to know where to look for the credentials.
resources/lang/en/app.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* ⚠️ Editing not allowed except for 'en' language.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
return [
resources/lang/en/auth.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* ⚠️ Editing not allowed except for 'en' language.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
return [
resources/lang/en/changelog.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* ⚠️ Editing not allowed except for 'en' language.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
return [
resources/lang/en/dashboard.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* ⚠️ Editing not allowed except for 'en' language.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
return [
resources/lang/en/format.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* ⚠️ Editing not allowed except for 'en' language.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
return [
resources/lang/en/journal.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* ⚠️ Editing not allowed except for 'en' language.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
return [
resources/lang/en/logs.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* ⚠️ Editing not allowed except for 'en' language.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
return [
resources/lang/en/mail.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* ⚠️ Editing not allowed except for 'en' language.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
return [
resources/lang/en/pagination.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* ⚠️ Editing not allowed except for 'en' language.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
return [
resources/lang/en/passwords.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* ⚠️ Editing not allowed except for 'en' language.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
return [
resources/lang/en/people.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* ⚠️ Editing not allowed except for 'en' language.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
return [
resources/lang/en/reminder.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* ⚠️ Editing not allowed except for 'en' language.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
return [
resources/lang/en/settings.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* ⚠️ Editing not allowed except for 'en' language.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
return [
resources/lang/en/validation.php
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* ⚠️ Editing not allowed except for 'en' language.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
return [
resources/lang/vendor/confirmation/en/confirmation.php
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* ⚠️ Edition not allowed except for 'en' language.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
return [
resources/lang/vendor/webauthn/en/errors.php
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
/**
* ⚠️ Edition not allowed except for 'en' language.
*
* @see https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md for translations.
* @see https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md for translations.
*/
return [
resources/views/settings/export.blade.php
+1 -1
View File
@@ -53,7 +53,7 @@
<button type="submit" class="btn">{{ trans('settings.export_sql_cta') }}</button>
</p>
</form>
<p>{!! trans('settings.export_sql_link_instructions', ['url' => 'https://github.com/monicahq/monica/blob/master/docs/installation/update.md#importing-sql-from-the-exporter-feature']) !!}</p>
<p>{!! trans('settings.export_sql_link_instructions', ['url' => 'https://github.com/monicahq/monica/blob/main/docs/installation/update.md#importing-sql-from-the-exporter-feature']) !!}</p>
<h4>{{ trans('settings.export_title_json') }}</h4>
<p>{{ trans('settings.export_json_explanation') }}</p>
resources/views/settings/index.blade.php
+1 -1
View File
@@ -91,7 +91,7 @@
</option>
@endforeach
</select>
<small class="form-text text-muted">{!! trans('settings.locale_help', ['url' => 'https://github.com/monicahq/monica/blob/master/docs/contribute/translate.md']) !!}</small>
<small class="form-text text-muted">{!! trans('settings.locale_help', ['url' => 'https://github.com/monicahq/monica/blob/main/docs/contribute/translate.md']) !!}</small>
</div>
{{-- currency for user --}}
scripts/ci/update-assets.sh
+2 -2
View File
@@ -68,8 +68,8 @@ git config user.name $ASSETS_USERNAME
git commit -m "chore(assets): Update assets"
# Push
if [ "$BRANCH" == "master" ] && [ "$PR_NUMBER" == "false" ]; then
echo -e "\033[0;31mmaster is not up to date, but we can't update it directly...\033[0;37m"
if [ "$BRANCH" == "main" ] && [ "$PR_NUMBER" == "false" ]; then
echo -e "\033[0;31mmain branch is not up to date, but we can't update it directly...\033[0;37m"
exit 0
elif [ -n "${ASSETS_GITHUB_TOKEN:-}" ]; then
template-definition.yaml
+3 -3
View File
@@ -26,7 +26,7 @@ info:
# This field should be 1-3 sentences describing how the project is setup, assuming the reader already knows what
# the application is.
description: |
Monica is an open-source web application to organize the interactions with your loved ones. We call it a PRM, or Personal Relationship Management. Think of it as a CRM (a popular tool used by sales teams in the corporate world) for your friends or family.
Monica is an open-source web application to organize the interactions with your loved ones. We call it a PRM, or Personal Relationship Management. Think of it as a CRM (a popular tool used by sales teams in the corporate world) for your friends or family.
# A list of tags associated with the template. These should be highly generic terms like "CMS", "Framework", and
# the language in which the application is written.
tags:
@@ -44,14 +44,14 @@ info:
content: "PHP 7.4<br/>MariaDB 10.4<br/>Redis 5.0"
# This key describes the initialization call made to the master environment at
# This key describes the initialization call made to the main environment at
# project creation time. This is part of the full v2 UI operation mode, which
# places project schema/options selection early in the creation process, rather
# than later as it exits now. To allow this schema to be backwards-compatible,
# this key also gets mapped to the appropriate location in project.settings so
# that the current UI can have its own workflow overridden as well.
initialize:
repository: git@github.com:monicahq/monica.git@master
repository: git@github.com:monicahq/monica.git@main
config: null
files: []
profile: PHP