Skip to content

Commit

Permalink
Merge branch 'main' into sarah11918-patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
sarah11918 authored Jan 3, 2025
2 parents e8e9f2e + d8e0f3a commit 2834c80
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/content/docs/en/guides/content-collections.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Projects may continue using the legacy Content Collections API introduced in Ast

You can define a **collection** from a set of data that is structurally similar. This can be a directory of blog posts, a JSON file of product items, or any data that represents multiple items of the same shape.

Collections stored locally in your project or on your filesystem can have entries of Markdown, MDX, Markdoc, or JSON files:
Collections stored locally in your project or on your filesystem can have entries of Markdown, MDX, Markdoc, YAML, or JSON files:

<FileTree>
- src/
Expand Down Expand Up @@ -85,7 +85,7 @@ The Content Layer API allows you to fetch your content (whether stored locally i

Astro provides two built-in loader functions (`glob()` and `file()`) for fetching your local content, as well as access to the API to construct your own loader and fetch remote data.

The `glob()` loader creates entries from directories of Markdown, MDX, Markdoc, or JSON files from anywhere on the filesystem. It accepts a `pattern` of entry files to match, and a `base` file path of where your files are located. Each entry's `id` will be automatically generated from its file name. Use this loader when you have one file per entry.
The `glob()` loader creates entries from directories of Markdown, MDX, Markdoc, or JSON files from anywhere on the filesystem. It accepts a `pattern` of entry files to match using glob patterns supported by [micromatch](https://github.com/micromatch/micromatch#matching-featuresh), and a base file path of where your files are located. Each entry's `id` will be automatically generated from its file name. Use this loader when you have one file per entry.

The `file()` loader creates multiple entries from a single local file. Each entry in the file must have a unique `id` key property. It accepts a `base` file path to your file and optionally a [`parser` function](#parser-function) for data files it cannot parse automatically. Use this loader when your data file can be parsed as an array of objects.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ You may also wish to reuse code from Gatsby's `src/components/seo.js` to include

### Migrating Pages and Posts

In Gatsby, your [pages and posts](/en/basics/astro-pages/) may exist in `src/pages/` or outside of `src` in another folder, like `content`. In Astro, **all your page content must live within `src/`**.
In Gatsby, your [pages and posts](/en/basics/astro-pages/) may exist in `src/pages/` or outside of `src` in another folder, like `content`. In Astro, all your page content must live within `src/` unless you are using [content collections](/en/guides/content-collections/).

#### React Pages

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ export default function Head() {

In Next.js, your posts either live in `/pages` or `/app/routeName/page.jsx`.

In Astro, **all your page content must live within `src/`**, unless you are using [content collections](/en/guides/content-collections/).
In Astro, all your page content must live within `src/` unless you are using [content collections](/en/guides/content-collections/).

#### React pages

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ You may also wish to reuse code from [your Nuxt's page's `head` property](https:

### Migrating Pages and Posts

In NuxtJS, your [pages](/en/basics/astro-pages/) live in `/pages`. In Astro, **all your page's content must live within `src/** unless you are using [content collections](/en/guides/content-collections/).
In NuxtJS, your [pages](/en/basics/astro-pages/) live in `/pages`. In Astro, all your page content must live within `src/` unless you are using [content collections](/en/guides/content-collections/).

#### Vue Pages

Expand Down
32 changes: 31 additions & 1 deletion src/content/nav/es.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,35 @@
import { navDictionary } from '../../util/navDictionary';

export default navDictionary({
// Add translations of English labels here
start: 'Inicio',
'start.welcome': '!Bienvenidos, Mundo!',
'start.newProject': 'Comienza un nuevo proyecto',
'start.config': 'Configuración',
'start.migrate': 'Migrar a Astro',

guides: 'Guías y Recetas',
'guides.routing': 'Enrutamiento y navegación',
'guides.ui': 'Construye tu UI',
'guides.content': 'Agrega contenido a tu sitio',
'guides.serverRendering': 'Renderizado en servidor',
'guides.upgrade': 'Actualizar',
'guides.upgrade.major': 'Guías de actualizaciones importantes',
'guides.recipes': 'Recetas prácticas',

reference: 'Referencia',
'reference.runtime': 'API de ejecución',
'reference.other': 'Otras APIs de desarrollo',
'reference.syntax': 'Sintaxis de Plantillas de Astro',
'reference.experimental': 'Características experimentales',

integrations: 'Integraciones',
'integrations.ui': 'UI frameworks',
'integrations.adapters': 'Adaptadores',
'integrations.other': 'Otras integraciones oficiales',

thirdParty: 'Servicios de Terceros',
'thirdParty.deployment': 'Guías de despliegue',
'thirdParty.cms': 'Sistemas de gestión de contenido',
'thirdParty.backend': 'Servicios Backend',
'thirdParty.media': 'Alojamiento media & DAM',
});

0 comments on commit 2834c80

Please sign in to comment.